X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fmimeview.c;h=57e53c7f9006c5018c64de5775bd228b7bf5354b;hp=8618d4f9eb1b6d559f8a3970d5c0c8a9b46b8ce9;hb=0560d0b39412e629e9668e1d9561811277cc8e6e;hpb=bb384650babcd83e9c66cb0c87eb8343bdf8113a

diff --git a/src/mimeview.c b/src/mimeview.c
index 8618d4f9e..57e53c7f9 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1058,7 +1058,9 @@ gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
 		 ? &filename[1] : filename, NULL);
 
 	g_free(filename);
-	return fullname;
+	filename = conv_filename_from_utf8(fullname);
+	g_free(fullname);
+	return filename;
 }
 
 /**
@@ -1079,9 +1081,16 @@ static gboolean mimeview_write_part(const gchar *filename,
 	if (is_file_exist(filename)) {
 		AlertValue aval;
 		gchar *res;
+		gchar *tmp;
+		
+		if (!g_utf8_validate(filename, -1, NULL))
+			tmp = conv_filename_to_utf8(filename);
+		else 
+			tmp = g_strdup(filename);
 		
 		res = g_strdup_printf(_("Overwrite existing file '%s'?"),
-				      filename);
+				      tmp);
+		g_free(tmp);
 		aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK, 
 				  GTK_STOCK_CANCEL, NULL);
 		g_free(res);