--- nautilus-sendto-0.12-orig/src/plugins/thunderbird.c	2007-09-09 10:28:11.000000000 +0200
+++ nautilus-sendto-0.12/src/plugins/thunderbird.c	2007-09-09 11:15:35.000000000 +0200
@@ -37,7 +37,7 @@
 	printf ("Init thunderbird plugin\n");
 	hash = g_hash_table_new (g_str_hash, g_str_equal);
 
-	t_cmd = g_find_program_in_path ("mozilla-thunderbird");
+	t_cmd = g_find_program_in_path ("thunderbird");
 	if (t_cmd == NULL)
 		return FALSE;
 	return TRUE;
@@ -74,14 +74,15 @@
 		g_string_append_printf (mailto, "to=%s,", send_to);		
 	}
 	
-	t_cmd = g_find_program_in_path ("mozilla-thunderbird");
+	t_cmd = g_find_program_in_path ("thunderbird");
 	if (t_cmd == NULL)
 		return FALSE;
 	
-	g_string_append_printf (mailto," attachment='\"%s\"'",file_list->data);
+	g_string_append_printf (mailto,"\"attachment='%s",file_list->data);
 	for (l = file_list->next ; l; l=l->next){				
-		g_string_append_printf (mailto,",'\"%s\"'",l->data);
+		g_string_append_printf (mailto,",%s",l->data);
 	}
+	g_string_append (mailto, "'\"");
 	cmd = g_strdup_printf ("%s %s", t_cmd, mailto->str);
 	g_spawn_command_line_async (cmd, NULL);
 	g_free (cmd);
--- nautilus-sendto-0.12-orig/configure	2006-11-02 18:01:01.000000000 +0100
+++ nautilus-sendto-0.12/configure	2006-11-02 22:48:41.000000000 +0100
@@ -20633,7 +20633,7 @@
 
 
 
-enable_thunderbird=no
+enable_thunderbird=yes
  if test "x$enable_thunderbird" = "xyes"; then
   HAVE_THUNDERBIRD_TRUE=
   HAVE_THUNDERBIRD_FALSE='#'
