X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Ftextview.c;h=b51a452141f851a4884dc112dd211576b0735c94;hp=b0d7d6f3f36e4b50263955e5555bb555642a0e86;hb=82a257a18d27c0c9eaf3eabafb4454d8a3135559;hpb=0b701072c504e4992d7180d5f33d2abe4ac69a2c

diff --git a/src/textview.c b/src/textview.c
index b0d7d6f3f..b51a45214 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -327,8 +327,8 @@ void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
 		charset = textview->messageview->forced_charset;
 	else if (prefs_common.force_charset)
 		charset = prefs_common.force_charset;
-	else if (mimeinfo->charset)
-		charset = mimeinfo->charset;
+	else
+		charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 
 	textview_set_font(textview, charset);
 	textview_clear(textview);
@@ -377,8 +377,8 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 		charset = textview->messageview->forced_charset;
 	else if (prefs_common.force_charset)
 		charset = prefs_common.force_charset;
-	else if (mimeinfo->charset)
-		charset = mimeinfo->charset;
+	else
+		charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 
 	textview_set_font(textview, charset);
 
@@ -454,8 +454,9 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 			charset = textview->messageview->forced_charset;
 		else if (prefs_common.force_charset)
 			charset = prefs_common.force_charset;
-		else if (mimeinfo->charset)
-			charset = mimeinfo->charset;
+		else
+			charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
+
 		textview_write_body(textview, mimeinfo, charset);
 	}