X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=c60af10983d77d61bddc8611383b0af2c144e5c9;hp=90fa27ec89b73790d0275830eab38026f249332d;hb=a5f1624b5d7a4e153fd1e324f993917ec4492122;hpb=50f8f787bc99a145b598a577af0cd98ae5f4c14b

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 90fa27e..c60af10 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -343,12 +343,19 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline
 								       "inline");
 				} else {
 					const gchar *filename;
+
 					filename = tny_mime_part_get_filename (old_attachment);
-					if (filename)
-						tny_mime_part_set_filename (attachment_part, filename);
-					else
+					if (filename) {
+						/* If the mime part has a filename do not set it again
+						   because Camel won't replace the old one. Instead it
+						   will append the filename to the old one and that will
+						   mislead email clients */
+						if (!tny_mime_part_get_filename (attachment_part))
+							tny_mime_part_set_filename (attachment_part, filename);
+					} else {
 						tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
 									       "attachment");
+					}
 				}
 				if (!TNY_IS_MSG (old_attachment))  {
 					tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");