diff --git a/evolution-data-server-1.11.3-camel-imap-folder.patch b/evolution-data-server-1.11.3-camel-imap-folder.patch
new file mode 100644
index 0000000..c8cc36b
--- /dev/null
+++ b/evolution-data-server-1.11.3-camel-imap-folder.patch
@@ -0,0 +1,20 @@
+--- evolution-data-server-1.11.3/camel/providers/imap/camel-imap-folder.c.camel-imap-folder	2007-05-10 05:26:55.000000000 -0400
++++ evolution-data-server-1.11.3/camel/providers/imap/camel-imap-folder.c	2007-06-15 12:19:22.000000000 -0400
+@@ -656,7 +656,7 @@ imap_rescan (CamelFolder *folder, int ex
+ 		uid = g_datalist_get_data (&data, "UID");
+ 		flags = GPOINTER_TO_UINT (g_datalist_get_data (&data, "FLAGS"));
+ 		
+-		if (!uid || !seq || seq > summary_len) {
++		if (!uid || !seq || seq > summary_len || seq < 0) {
+ 			g_datalist_clear (&data);
+ 			continue;
+ 		}
+@@ -2790,7 +2790,7 @@ parse_fetch_response (CamelImapFolder *i
+ 		
+ 		if (*response != '*' || *(response + 1) != ' ')
+ 			return NULL;
+-		seq = strtol (response + 2, &response, 10);
++		seq = strtoul (response + 2, &response, 10);
+ 		if (seq == 0)
+ 			return NULL;
+ 		if (g_ascii_strncasecmp (response, " FETCH (", 8) != 0)
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 1cb4b49..f1aa615 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.11.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -69,6 +69,9 @@ Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
 # GNOME bug #312584
 Patch21: evolution-data-server-1.11.3-exchange-hierarchy-webdav.patch
 
+# GNOME bug #447414
+Patch22: evolution-data-server-1.11.3-camel-imap-folder.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -159,6 +162,7 @@ evolution-data-server.
 %patch19 -p1 -b .camel-folder-symmary-crash
 %patch20 -p1 -b .camel-certdb-nss-cert-get
 %patch21 -p1 -b .exchange-hierarchy-webdav
+%patch22 -p1 -b .camel-imap-folder
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -383,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Fri Jun 15 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.3-3.fc8
+- Add patch for GNOME bug #224277 (Camel IMAP security flaw).
+
 * Thu Jun 14 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.3-2.fc8
 - Add patch for GNOME bug #312584 (renaming Exchange folders).