From 39087ae79cbe846c3a1468f94853beb08ff349ef Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 20 Jul 2019 22:59:48 +0200
Subject: [PATCH] Removed workaround

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e6785e8fa8..f50bef3c53 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -901,10 +901,6 @@ public class MessageHelper {
                 if (TextUtils.isEmpty(charset) || "US-ASCII".equals(charset.toUpperCase())) {
                     // The first 127 characters are the same as in US-ASCII
                     result = new String(result.getBytes(StandardCharsets.ISO_8859_1));
-                } else if (encoding != null && "8bit".equals(encoding.toLowerCase()) &&
-                        "ISO-8859-1".equals(charset.toUpperCase())) {
-                    // Workaround JavaMail bug
-                    result = new String(result.getBytes(StandardCharsets.ISO_8859_1));
                 } else {
                     if ("US-ASCII".equals(Charset.forName(charset).name()))
                         warnings.add(context.getString(R.string.title_no_charset, charset));