diff -u evolution-2.30.3/debian/changelog evolution-2.30.3/debian/changelog
--- evolution-2.30.3/debian/changelog
+++ evolution-2.30.3/debian/changelog
@@ -1,3 +1,12 @@
+evolution (2.30.3-1ubuntu7.2) maverick-proposed; urgency=low
+
+  * debian/patches/93_git_hide_junk_messages_in_search_folders.patch:
+    - do not show Junk messages in Search folders (LP: #665330)
+  * debian/patches/93_git_use_proxy_cred_for_images.patch:
+    - use proxy credentials when loading images from the web (LP: #664169)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 23 Nov 2010 11:55:35 -0500
+
 evolution (2.30.3-1ubuntu7.1) maverick-proposed; urgency=low
 
   * debian/patches/89_express.patch:
only in patch2:
unchanged:
--- evolution-2.30.3.orig/debian/patches/93_git_hide_junk_messages_in_search_folders.patch
+++ evolution-2.30.3/debian/patches/93_git_hide_junk_messages_in_search_folders.patch
@@ -0,0 +1,22 @@
+From 745fba39b4fcdd57fc5a1bbab32062a77bcb2187 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 06 Oct 2010 09:41:46 +0000
+Subject: Bug #617953 - Hide Junk messages in Search folders
+
+With adaptation work by Brian J. Murrell <brian@interlinx.bc.ca>
+---
+diff --git a/mail/message-list.c b/mail/message-list.c
+index cf68a06..8211837 100644
+--- a/mail/message-list.c
++++ b/mail/message-list.c
+@@ -2930,7 +2930,7 @@ folder_store_supports_vjunk_folder (CamelFolder *folder)
+ 	if (!store)
+ 		return FALSE;
+ 
+-	return (store->flags & CAMEL_STORE_VJUNK) != 0;
++	return (store->flags & CAMEL_STORE_VJUNK) != 0 || CAMEL_IS_VEE_FOLDER (folder);
+ }
+ 
+ /* Check if the given node is selectable in the current message list,
+--
+cgit v0.8.3.1
only in patch2:
unchanged:
--- evolution-2.30.3.orig/debian/patches/93_git_use_proxy_cred_for_images.patch
+++ evolution-2.30.3/debian/patches/93_git_use_proxy_cred_for_images.patch
@@ -0,0 +1,91 @@
+From 20c9cc11ac5eb5f02f99fd9907c3abd67c70f1b8 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 21 Oct 2010 07:28:36 +0000
+Subject: Bug #631526 - Loading images doesn't use proxy credentials
+
+---
+diff --git a/mail/em-utils.c b/mail/em-utils.c
+index 7e6b74e..91aef5e 100644
+--- a/mail/em-utils.c
++++ b/mail/em-utils.c
+@@ -1187,6 +1187,69 @@ em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri)
+ static EProxy *emu_proxy = NULL;
+ static GStaticMutex emu_proxy_lock = G_STATIC_MUTEX_INIT;
+ 
++/* encode to string this way, because soup_uri_to_string doesn't include passwords */
++static gchar *
++suri_to_string (SoupURI *suri)
++{
++	GString *uri;
++	gchar *tmp;
++
++	if (!suri)
++		return NULL;
++
++	uri = g_string_sized_new (20);
++
++	if (suri->scheme)
++		g_string_append_printf (uri, "%s:", suri->scheme);
++	if (suri->host) {
++		g_string_append (uri, "//");
++		if (suri->user) {
++			tmp = soup_uri_encode (suri->user, ":/;#@?\\");
++			g_string_append (uri, tmp);
++			g_free (tmp);
++		}
++
++		if (suri->password) {
++			g_string_append_c (uri, ':');
++			tmp = soup_uri_encode (suri->password, ":/;#@?\\");
++			g_string_append (uri, tmp);
++			g_free (tmp);
++		}
++
++		if (suri->user || suri->password)
++			g_string_append_c (uri, '@');
++
++		if (strchr (suri->host, ':')) {
++			g_string_append_c (uri, '[');
++			g_string_append (uri, suri->host);
++			g_string_append_c (uri, ']');
++		} else {
++			tmp = soup_uri_encode (suri->host, ":/");
++			g_string_append (uri, tmp);
++			g_free (tmp);
++		}
++
++		if (suri->port && !soup_uri_uses_default_port (suri))
++			g_string_append_printf (uri, ":%d", suri->port);
++		if (!suri->path && (suri->query || suri->fragment))
++			g_string_append_c (uri, '/');
++	}
++
++	if (suri->path && *suri->path)
++		g_string_append (uri, suri->path);
++
++	if (suri->query) {
++		g_string_append_c (uri, '?');
++		g_string_append (uri, suri->query);
++	}
++	if (suri->fragment) {
++		g_string_append_c (uri, '#');
++		g_string_append (uri, suri->fragment);
++	}
++
++	return g_string_free (uri, FALSE);
++}
++
+ static gpointer
+ emu_proxy_setup (gpointer data)
+ {
+@@ -1218,7 +1281,7 @@ em_utils_get_proxy_uri (const gchar *pUri)
+ 	}
+ 
+ 	if (e_proxy_require_proxy_for_uri (emu_proxy, pUri))
+-		uri = soup_uri_to_string (e_proxy_peek_uri_for (emu_proxy, pUri), FALSE);
++		uri = suri_to_string (e_proxy_peek_uri_for (emu_proxy, pUri));
+ 
+ 	g_static_mutex_unlock (&emu_proxy_lock);
+ 
+--
+cgit v0.8.3.1