diff -u evolution-data-server-2.22.3/debian/changelog evolution-data-server-2.22.3/debian/changelog
--- evolution-data-server-2.22.3/debian/changelog
+++ evolution-data-server-2.22.3/debian/changelog
@@ -1,3 +1,10 @@
+evolution-data-server (2.22.3-0ubuntu2) hardy; urgency=low
+
+  * Include upstream patch to fix dealing with broken MIME servers.
+    (LP: 194642)
+
+ -- Michael B. Trausch <mike@trausch.us>  Thu, 17 Jul 2008 13:33:09 -0400
+
 evolution-data-server (2.22.3-0ubuntu1) hardy-proposed; urgency=low
 
   * New upstream version:
only in patch2:
unchanged:
--- evolution-data-server-2.22.3.orig/debian/patches/99-from-svn-fix-broken-mime-server.path.patch
+++ evolution-data-server-2.22.3/debian/patches/99-from-svn-fix-broken-mime-server.path.patch
@@ -0,0 +1,32 @@
+diff -Nur -x '*.orig' -x '*~' evolution-data-server-2.22.3/camel/camel-mime-utils.c evolution-data-server-2.22.3.new/camel/camel-mime-utils.c
+--- evolution-data-server-2.22.3/camel/camel-mime-utils.c	2008-04-04 05:01:59.000000000 -0400
++++ evolution-data-server-2.22.3.new/camel/camel-mime-utils.c	2008-07-17 15:55:21.000000000 -0400
+@@ -3418,8 +3418,11 @@
+ 			}
+ 		} else {
+ 			g_string_append_printf (out, "%s%s=", p->name, encoded ? "*" : "");
+-
+-			if (encoded || !quote)
++			
++			/* Quote even if we don't need to in order to
++			 * work around broken mail software like the
++			 * Jive Forums' NNTP gateway */
++			if (encoded /*|| !quote*/)
+ 				g_string_append (out, value);
+ 			else
+ 				quote_word (out, TRUE, value, vlen);
+diff -Nur -x '*.orig' -x '*~' evolution-data-server-2.22.3/camel/ChangeLog evolution-data-server-2.22.3.new/camel/ChangeLog
+--- evolution-data-server-2.22.3/camel/ChangeLog	2008-06-30 02:03:23.000000000 -0400
++++ evolution-data-server-2.22.3.new/camel/ChangeLog	2008-07-17 15:55:45.000000000 -0400
+@@ -30,6 +30,11 @@
+ 	direct access (i.e. ->headers) since the message does not have
+ 	headers' pointer if the message is in vitrual folder.
+ 
++2008-05-22  Jeffrey Stedfast  <fejj@novell.com>
++
++	* camel-mime-utils.c (camel_header_param_list_format_append): Work
++	around the broken "Jive Forums" NNTP gateway. Fixes bug #518312.
++
+ 2008-05-13  Tor Lillqvist  <tml@novell.com>
+ 
+ 	* camel-net-utils.h [Win32]: Define WIN32_LEAN_AND_MEAN around