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-24 13:28:35.000000000 +0200
@@ -263,6 +263,19 @@
 	}
 }
 
+static char *
+esc_comma (GList *file_list)  /* for Thunderbird */
+{
+	char *filename = NULL;
+	char **split = NULL;
+
+	split = g_strsplit ((char *)file_list->data, ",", -1);
+	filename = g_strjoinv ("%2c", split);
+	g_strfreev (split);
+		
+	return filename;
+}
+
 static void
 get_thunderbird_mailto (GtkWidget *contact_widget, GString *mailto, GList *file_list)
 {
@@ -281,9 +294,9 @@
 		if (text != NULL && *text != '\0')
 			g_string_append_printf (mailto, "to='%s',", text);
 	}
-	g_string_append_printf (mailto,"attachment='%s", (char *)file_list->data);
+	g_string_append_printf (mailto,"attachment='%s", esc_comma (file_list));
 	for (l = file_list->next ; l; l=l->next){
-		g_string_append_printf (mailto,",%s", (char *)l->data);
+		g_string_append_printf (mailto,",%s", esc_comma (l));
 	}
 	g_string_append (mailto, "'\"");
 }
