--- gm-notify.orig	2011-07-16 11:32:20.199759000 +0200
+++ gm-notify	2011-07-16 12:49:58.406889410 +0200
@@ -197,15 +197,19 @@
         
         # Open mail client
         if self.client.get_bool("/apps/gm-notify/openclient"):
-            command = self.client.get_string("/desktop/gnome/url-handlers/mailto/command").split(" ")[0]
-            if command.find("mutt") != -1: command += " -f =%s" % indicator.label
-            if self.client.get_bool("/desktop/gnome/url-handlers/mailto/needs_terminal"):
-                termCmd = self.client.get_string("/desktop/gnome/applications/terminal/exec")
-                if termCmd:
-                    termCmd += " " + self.client.get_string("/desktop/gnome/applications/terminal/exec_arg") + " "
-                else:
-                    termCmd = "gnome-terminal -x "
-                command = termCmd + command
+            custom_command = self.client.get_string("/apps/gm-notify/custom_client")
+	    if custom_command:
+                command = custom_command
+            else:
+                command = self.client.get_string("/desktop/gnome/url-handlers/mailto/command").split(" ")[0]
+                if command.find("mutt") != -1: command += " -f =%s" % indicator.label
+                if self.client.get_bool("/desktop/gnome/url-handlers/mailto/needs_terminal"):
+                    termCmd = self.client.get_string("/desktop/gnome/applications/terminal/exec")
+                    if termCmd:
+                        termCmd += " " + self.client.get_string("/desktop/gnome/applications/terminal/exec_arg") + " "
+                    else:
+                        termCmd = "gnome-terminal -x "
+                    command = termCmd + command
             subprocess.Popen(command, shell=True)
         else:
             webbrowser.open(url)