diff -uNr --exclude 'Makefile*' --exclude 'config*' nautilus-sendto-gitclone/src/plugins/evolution/evolution.c nautilus-sendto-patch/src/plugins/evolution/evolution.c
--- nautilus-sendto-gitclone/src/plugins/evolution/evolution.c	2009-10-23 09:20:56.000000000 +0200
+++ nautilus-sendto-patch/src/plugins/evolution/evolution.c	2009-10-23 12:35:16.000000000 +0200
@@ -242,7 +242,8 @@
 {
 	GList *l;
 
-	g_string_append (mailto, "--compose=");
+	if (!strstr (mail_cmd, "-m") && !strstr (mail_cmd, "--compose="))
+		g_string_append (mailto, "--compose=");
 	if (email != NULL) {
 		if (name != NULL)
 			g_string_append_printf (mailto, "\""CONTACT_FORMAT"\"", name, email);
@@ -257,9 +258,9 @@
 		else
 			g_string_append (mailto, "\"\"");
 	}
-	g_string_append_printf (mailto," attach=\"%s\"", (char *)file_list->data);
+	g_string_append_printf (mailto," --attach=\"%s\"", (char *)file_list->data);
 	for (l = file_list->next ; l; l=l->next){
-		g_string_append_printf (mailto," attach=\"%s\"", (char *)l->data);
+		g_string_append_printf (mailto," --attach=\"%s\"", (char *)l->data);
 	}
 }
 
