From 130af18f06ae9b91e07985ff56b4dd90cedbd744 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 31 Oct 2019 00:33:04 +0000 Subject: msgiter: do not assume UTF-8 if Email::MIME->body_str succeeds ISO-2202-JP and other non-UTF-8 messages need to be displayed correctly. Fixes: 7d82a8bc04ce ('handle "multipart/mixed" messages which are not multipart') --- lib/PublicInbox/MsgIter.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/PublicInbox/MsgIter.pm b/lib/PublicInbox/MsgIter.pm index ce08ff84..f11ba223 100644 --- a/lib/PublicInbox/MsgIter.pm +++ b/lib/PublicInbox/MsgIter.pm @@ -45,7 +45,8 @@ sub msg_part_text ($$) { # times when it should not have been: # <87llgalspt.fsf@free.fr> # <200308111450.h7BEoOu20077@mail.osdl.org> - if ($ct =~ m!\btext/plain\b!i || $ct =~ m!\bmultipart/mixed\b!i) { + if ($err && ($ct =~ m!\btext/plain\b!i || + $ct =~ m!\bmultipart/mixed\b!i)) { # Try to assume UTF-8 because Alpine seems to # do wacky things and set charset=X-UNKNOWN $part->charset_set('UTF-8'); -- cgit v1.2.3-24-ge0c7