diff --git a/mail-notification-mail-reader-launch.patch b/mail-notification-mail-reader-launch.patch
new file mode 100644
index 0000000..e41b5b3
--- /dev/null
+++ b/mail-notification-mail-reader-launch.patch
@@ -0,0 +1,23 @@
+--- mail-notification-3.0.org/src/mn-conf.c	2006-05-18 09:23:42.000000000 -0400
++++ mail-notification-3.0/src/mn-conf.c	2006-11-11 07:58:01.000000000 -0500
+@@ -1119,14 +1119,15 @@
+   if (strip_format)
+     {
+       GString *stripped;
+-      char *start;
+-      char *p;
+ 
+       stripped = g_string_new(NULL);
++      g_string_append_len(stripped, command, strstr(command, " ") - command);
+ 
+-      for (start = command; (p = strstr(start, "%s")); start = p + 2)
+-	g_string_append_len(stripped, start, p - start);
+-      g_string_append(stripped, start);
++      if (!strcmp(stripped->str, "mozilla"))
++        g_string_append(stripped, " -mail");
++
++      if (!strcmp(stripped->str, "evolution"))
++        g_string_append(stripped, " --component=mail");
+ 
+       g_free(command);
+       command = g_string_free(stripped, FALSE);
diff --git a/mail-notification.spec b/mail-notification.spec
index 426838f..db55313 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -2,7 +2,7 @@
 
 Name:           mail-notification
 Version:        3.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@ URL:            http://www.nongnu.org/mailnotify/
 Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-3.0.tar.gz
 Source1:        mail-notification-README.FEDORA
 Patch0:         mail-notification-fedora-plugin-hint.patch
+Patch1:         mail-notification-mail-reader-launch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -57,6 +58,7 @@ Evolution support for Mail Notification.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .patch0
+%patch1 -p1 -b .patch1
 cp %{SOURCE1} ./README.FEDORA
 # FIXME -- quick workaround for now
 sed -i 's/evolution_branch=2.8/evolution_branch=2.10/' configure
@@ -133,6 +135,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Tue Nov 21 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-11
+- add mail-notification-mail-reader-launch.patch (#215119, credits go to
+  John Conroy)
+
 * Thu Nov 09 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>  3.0-10
 - Update patch