diff --git a/evolution-3.6.2-rhbug875109.patch b/evolution-3.6.2-rhbug875109.patch
new file mode 100644
index 0000000..de8d8c4
--- /dev/null
+++ b/evolution-3.6.2-rhbug875109.patch
@@ -0,0 +1,40 @@
+diff --git a/mail/e-http-request.c b/mail/e-http-request.c
+index 84b243b..4b77950 100644
+--- a/mail/e-http-request.c
++++ b/mail/e-http-request.c
+@@ -168,7 +168,9 @@ handle_http_request (GSimpleAsyncResult *res,
+ 
+ 	/* Remove the __evo-mail query */
+ 	soup_uri = soup_request_get_uri (SOUP_REQUEST (request));
+-	query = soup_form_decode (soup_uri->query);
++	g_return_if_fail (soup_uri_get_query (soup_uri) != NULL);
++
++	query = soup_form_decode (soup_uri_get_query (soup_uri));
+ 	mail_uri = g_hash_table_lookup (query, "__evo-mail");
+ 	if (mail_uri)
+ 		mail_uri = g_strdup (mail_uri);
+@@ -432,7 +434,9 @@ http_request_send_async (SoupRequest *request,
+ 
+ 	ehr = E_HTTP_REQUEST (request);
+ 	uri = soup_request_get_uri (request);
+-	query = soup_form_decode (uri->query);
++	g_return_if_fail (soup_uri_get_query (uri) != NULL);
++
++	query = soup_form_decode (soup_uri_get_query (uri));
+ 
+ 	d ({
+ 		gchar *uri_str = soup_uri_to_string (uri, FALSE);
+diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
+index 5e33ccd..a544518 100644
+--- a/mail/e-mail-display.c
++++ b/mail/e-mail-display.c
+@@ -355,7 +355,8 @@ mail_display_resource_requested (WebKitWebView *web_view,
+ 
+ 	/* Redirect http(s) request to evo-http(s) protocol.
+ 	 * See EMailRequest for further details about this. */
+-	} else if (g_str_has_prefix (uri, "http:") || g_str_has_prefix (uri, "https")) {
++	} else if (g_str_has_prefix (uri, "http:") || g_str_has_prefix (uri, "https:") ||
++	    g_str_has_prefix (uri, "evo-http:") || g_str_has_prefix (uri, "evo-https:")) {
+ 		gchar *new_uri, *mail_uri, *enc;
+ 		SoupURI *soup_uri;
+ 		GHashTable *query;
diff --git a/evolution.spec b/evolution.spec
index ec2ce03..37c0e39 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,7 +29,7 @@
 
 Name: evolution
 Version: 3.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -49,6 +49,8 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
+Patch03: evolution-3.6.2-rhbug875109.patch
+
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -190,6 +192,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
+%patch03 -p1 -b .rhbug875109
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -528,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Nov 13 2012 Milan Crha <mcrha@redhat.com> - 3.6.2-2
+- Add patch for Red Hat bug #875109 (Crash in http_request_send_async)
+
 * Mon Nov 12 2012 Milan Crha <mcrha@redhat.com> - 3.6.2-1
 - Update to 3.6.2