diff -Nru /tmp/AloUGZNkoh/evolution-2.12.1/debian/changelog /tmp/VjlatTkHip/evolution-2.12.1/debian/changelog
--- /tmp/AloUGZNkoh/evolution-2.12.1/debian/changelog	2008-02-23 16:25:04.000000000 -0500
+++ /tmp/VjlatTkHip/evolution-2.12.1/debian/changelog	2008-02-23 16:25:10.000000000 -0500
@@ -1,3 +1,20 @@
+evolution (2.12.1-0ubuntu2~mbt2) gutsy; urgency=low
+
+  * Commented fix (which now works in my situation) so that the situation
+    is known.  However, the problem is not solved; this fix breaks MIME
+    by not supplying a charset for certain types of attachments.  The real
+    solution must be in evolution-data-server... see
+    debian/patches/90_mbt-attempt-to-fix-bad-servers.patch for details.
+
+ -- Michael B. Trausch <mike@trausch.us>  Sat, 23 Feb 2008 16:20:40 -0500
+
+evolution (2.12.1-0ubuntu2~mbt1) gutsy; urgency=low
+
+  * Attempt to work around broken servers by not providing charset=
+    in Content-Type, thus removing server’s fodder to mangle filenames
+
+ -- Michael B. Trausch <mike@trausch.us>  Sat, 23 Feb 2008 15:27:44 -0500
+
 evolution (2.12.1-0ubuntu1) gutsy-proposed; urgency=low
 
   * New bugfix upstream release:
@@ -598,7 +615,7 @@
   * debian/patches/04_autoconf.patch:
     - autoconf patch
   * debian/patches/90_list_arabic_encoding.patch:
-    - change by Martin Jürgens to list arabic encoding (Ubuntu: #82322)
+    - change by Martin Jürgens to list arabic encoding (Ubuntu: #82322)
   * debian/patches/91_revert_uri_change.patch:
     - revert the change that broke the command line calendar opening 
       (Ubuntu: #84554)
@@ -852,7 +869,7 @@
   * debian/patches/65_null-camel-exception.patch: stop using NULL in
     place of Camel exceptions
   * debian/patches/70_build-experimental-plugins.patch: Build
-    experimental plugins. Thanks to Michel Dänzer. (Closes: #312288)
+    experimental plugins. Thanks to Michel Dänzer. (Closes: #312288)
   * debian/patches/evolution{,-plugins}.install: Move base plugins to
     evolution package
 
diff -Nru /tmp/AloUGZNkoh/evolution-2.12.1/debian/patches/90_mbt-attempt-to-fix-bad-servers.patch /tmp/VjlatTkHip/evolution-2.12.1/debian/patches/90_mbt-attempt-to-fix-bad-servers.patch
--- /tmp/AloUGZNkoh/evolution-2.12.1/debian/patches/90_mbt-attempt-to-fix-bad-servers.patch	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/VjlatTkHip/evolution-2.12.1/debian/patches/90_mbt-attempt-to-fix-bad-servers.patch	2008-02-23 16:25:10.000000000 -0500
@@ -0,0 +1,24 @@
+--- evolution-2.12.1/widgets/misc/e-attachment-bar.c	2007-10-12 03:03:59.000000000 -0400
++++ evolution-2.12.1.new/widgets/misc/e-attachment-bar.c	2008-02-23 16:20:00.000000000 -0500
+@@ -1080,7 +1080,20 @@
+ 	content = camel_medium_get_content_object (CAMEL_MEDIUM (attachment->body));
+ 	
+ 	if (!CAMEL_IS_MULTIPART (content)) {
+-		if (camel_content_type_is (content_type, "text", "*")) {
++		/*
++		 * FIXME: changed the third parameter to camel_content_type_is
++		 * below to work around a very specific issue I was having with
++		 * sending messages to a server.  The proper fix looks like it
++		 * should be in evolution-data-server, file camel-mime-utils.c,
++		 * function camel_header_param_list_format_append(), where it
++		 * should add the name= parameter last, when provided.  This
++		 * would then work around brain-dead servers that cannot handle
++		 * it in the middle.  I have not figured out just how to do
++		 * that just yet, but I am working on it.
++		 *
++		 *  -- Mike Trausch <mike@trausch.us>
++		 */
++		if (camel_content_type_is (content_type, "text", "plain")) {
+ 			CamelTransferEncoding encoding;
+ 			CamelStreamFilter *filter_stream;
+ 			CamelMimeFilterBestenc *bestenc;