talons

commit 1d0409a41f55b3bf6e05a9f2a1a79643b8b62121
parent afb2211934dec2ef36d9597b91241f29e58fe112
Author: wwp <wwp@free.fr>
Date:   Mon, 11 Jun 2018 13:18:34 +0200

Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

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

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/messageview.c b/src/messageview.c
@@ -1537,8 +1537,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 			}
 			messageview_find_part_depth_first(&context, MIMETYPE_TEXT, "html");
 			if (context.found &&
-			    (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_ALWAYS ||
-			     (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_DEFAULT &&
+			    ((msginfo->folder && msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_ALWAYS) ||
+			     ((msginfo->folder && 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))