talons

commit c33ae843e9a1b94271faff6e934c72662470e11e
parent 5bef3aecedf1f062cc9ddf9a3b819841a5d989f8
Author: Paul <paul@claws-mail.org>
Date:   Sat, 20 Feb 2016 10:10:21 +0000

prevent always selecting html part in multipart/alternative

this bug was introduced in 4745b80528426498b9e4f61d0f1a812e94ce1a6e

Diffstat:
M
src/messageview.c
 | 
5
++++-

1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/messageview.c b/src/messageview.c
@@ -1526,7 +1526,10 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 				}
 			}
 			messageview_find_part_depth_first(&context, MIMETYPE_TEXT, "html");
-			if (context.found) { /* html found */
+			if (context.found &&
+			    (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_ALWAYS ||
+			     (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_DEFAULT &&
+			      prefs_common.promote_html_part))) { /* html found */
 				mimeinfo = context.found;
 				if (messageview_try_select_mimeinfo(messageview, msginfo, mimeinfo))
 					goto done;