diff --git a/evolution-2.10.1-fix-uri-handling.patch b/evolution-2.10.1-fix-uri-handling.patch
new file mode 100644
index 0000000..6df1026
--- /dev/null
+++ b/evolution-2.10.1-fix-uri-handling.patch
@@ -0,0 +1,45 @@
+--- evolution-2.10.1/shell/e-shell.c.fix-uri-handling	2007-04-22 20:19:39.000000000 -0400
++++ evolution-2.10.1/shell/e-shell.c	2007-04-22 20:20:25.000000000 -0400
+@@ -257,8 +257,8 @@
+ {
+ 	EShell *shell = E_SHELL (bonobo_object_from_servant (servant));
+ 	EComponentInfo *component_info;
++	GtkWidget *shell_window;
+ 	char *schema, *p;
+-	int show = FALSE;
+ 
+ 	schema = g_alloca(strlen(uri)+1);
+ 	strcpy(schema, uri);
+@@ -267,26 +267,20 @@
+ 		*p = 0;
+ 
+  	component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema);
+-	if (component_info == NULL) {
+-		show = TRUE;
++	if (component_info == NULL)
+ 		component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema);
+-	}
+ 
+ 	if (component_info == NULL) {
+ 		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_UnsupportedSchema, NULL);
+ 		return;
+ 	}
+ 
+-	if (show) {
+-		GtkWidget *shell_window;
+-		
+-		shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
+-		if (shell_window == NULL) {
+-			CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
+-			return;
+-		}
++	shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
++	if (shell_window == NULL) {
++		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
++		return;
+ 	}
+-	
++
+ 	GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev);
+ 	/* not an error not to implement it */
+ 	if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0)
diff --git a/evolution.spec b/evolution.spec
index 9c749ee..3daaf4e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -161,12 +161,15 @@ Patch47: evolution-2.10.0-drop-old-glib-support.patch
 # GNOME bug #427939 (gnome-doc-utils)
 Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
 
-# RH bug 235878 / GNOME bug #386503
+# RH bug #235878 / GNOME bug #386503
 Patch49: evolution-2.10.1-fix-help.patch
 
-# RH bug 234315 / GNOME bug #423766
+# RH bug #234315 / GNOME bug #423766
 Patch50: evolution-2.10.1-saving-attachments.patch
 
+# RH bug #236860 / GNOME bug #407104
+Patch51: evolution-2.10.1-fix-uri-handling.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -322,6 +325,7 @@ Development files needed for building things which link against evolution.
 %patch48 -p1 -b .fix-gnome-doc-utils
 %patch49 -p1 -b .fix-help
 %patch50 -p1 -b .saving-attachments
+%patch51 -p1 -b .fix-uri-handling
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -738,6 +742,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sun Apr 22 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-6.fc7
+- Add patch for RH bug #236860 (launching from clock applet).
+
 * Sat Apr 21 2007 Matthias Clasen <mclasen@redhat.com> - 2.10.1-5
 - Don't install INSTALL