msgiter: do not assume UTF-8 if Email::MIME->body_str succeeds

[public-inbox.git] / lib / PublicInbox / MsgIter.pm

diff --git a/lib/PublicInbox/MsgIter.pm b/lib/PublicInbox/MsgIter.pm
index eb94d621d73cdbcde4fee70d93a52fe3ba4d8f1d..f11ba223c93362a985285555e4113feab87684f1 100644 (file)
--- a/lib/PublicInbox/MsgIter.pm
+++ b/lib/PublicInbox/MsgIter.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # read-only utilities for Email::MIME
@@ -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');