diff --git a/evolution-data-server-2.91.1-gn631804.patch b/evolution-data-server-2.91.1-gn631804.patch
new file mode 100644
index 0000000..94f7b9d
--- /dev/null
+++ b/evolution-data-server-2.91.1-gn631804.patch
@@ -0,0 +1,12 @@
+diff -up evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c.gn631804 evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c
+--- evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c.gn631804	2010-10-25 14:32:46.000000000 +0200
++++ evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c	2010-10-25 14:33:25.000000000 +0200
+@@ -4938,7 +4938,7 @@ imapx_server_dispose (GObject *object)
+ 	QUEUE_UNLOCK (server);
+ 
+ 	if (server->parser_thread) {
+-		g_thread_join (server->parser_thread);
++		//g_thread_join (server->parser_thread);
+ 		server->parser_thread = NULL;
+ 	}
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 1027dfc..49c8468 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 2.91.1
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -41,6 +41,9 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# Mask bug #631804
+Patch12: evolution-data-server-2.91.1-gn631804.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -118,6 +121,7 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch11 -p1 -b .fix-64bit-acinclude
+%patch12 -p1 -b .gn631804
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -332,6 +336,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Oct 25 2010 Milan Crha <mcrha@redhat.com> - 2.91.1.1-1
+- Add test patch to workaround imapx Gnome bug #631804
+
 * Mon Oct 18 2010 Milan Crha <mcrha@redhat.com> - 2.91.1-1
 - Update to 2.91.1