|
|
@ -3600,7 +3600,7 @@ public class MessageHelper {
|
|
|
|
MimeTextPart p1 = parts.get(p);
|
|
|
|
MimeTextPart p1 = parts.get(p);
|
|
|
|
MimeTextPart p2 = parts.get(p + 1);
|
|
|
|
MimeTextPart p2 = parts.get(p + 1);
|
|
|
|
// https://bugzilla.mozilla.org/show_bug.cgi?id=1374149
|
|
|
|
// https://bugzilla.mozilla.org/show_bug.cgi?id=1374149
|
|
|
|
if (!"ISO-2022-JP".equalsIgnoreCase(p1.charset) &&
|
|
|
|
if (!("ISO-2022-JP".equalsIgnoreCase(p1.charset) && "B".equalsIgnoreCase(p1.encoding)) &&
|
|
|
|
p1.charset != null && p1.charset.equalsIgnoreCase(p2.charset) &&
|
|
|
|
p1.charset != null && p1.charset.equalsIgnoreCase(p2.charset) &&
|
|
|
|
p1.encoding != null && p1.encoding.equalsIgnoreCase(p2.encoding) &&
|
|
|
|
p1.encoding != null && p1.encoding.equalsIgnoreCase(p2.encoding) &&
|
|
|
|
p1.text != null && !p1.text.endsWith("=")) {
|
|
|
|
p1.text != null && !p1.text.endsWith("=")) {
|
|
|
|