From 5605c84c4ffab6fd4c3e87f02c1c0ac5fbab36cb Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 14 Feb 2022 11:39:51 +0100 Subject: [PATCH] Fixed decoding of some subjects --- app/src/main/java/eu/faircode/email/MessageHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 0575d56d8f..31c76b090c 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2658,7 +2658,9 @@ public class MessageHelper { while (p + 1 < parts.size()) { MimeTextPart p1 = parts.get(p); MimeTextPart p2 = parts.get(p + 1); - if (p1.charset != null && p1.charset.equalsIgnoreCase(p2.charset) && + // https://bugzilla.mozilla.org/show_bug.cgi?id=1374149 + if (!"ISO-2022-JP".equalsIgnoreCase(p1.charset) && + p1.charset != null && p1.charset.equalsIgnoreCase(p2.charset) && p1.encoding != null && p1.encoding.equalsIgnoreCase(p2.encoding)) { try { byte[] b1 = decodeWord(p1.text, p1.encoding, p1.charset);