From: Paul <paul@claws-mail.org>
Date: Mon, 15 Dec 2014 21:42:25 +0000 (+0000)
Subject: fix bug 3351, 'Two problems when re-sending a file with an attachment' (really one... 
X-Git-Tag: 3.12.0~199
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=656c1735cc75f73417ea1913355778bd4ecbc4fb

fix bug 3351, 'Two problems when re-sending a file with an attachment' (really one problem, though)
---

diff --git a/src/procmime.c b/src/procmime.c
index a4630261d..20401d86c 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -819,7 +819,7 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 		}
 		ertf_parser_destroy(parser);
 		conv_code_converter_destroy(conv);
-	} else if (mimeinfo->type == MIMETYPE_TEXT) {
+	} else if (mimeinfo->type == MIMETYPE_TEXT && mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {
 		while (SC_FGETS(buf, sizeof(buf), tmpfp) != NULL) {
 			str = conv_codeset_strdup(buf, src_codeset, CS_UTF_8);
 			if (str) {