From 1cd3f84ed6ec4d22bc7c8eb9af9acee2008a895c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 28 Aug 2020 19:23:53 +0200
Subject: [PATCH] Guess convert plain text to UTF8

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 6eb7bee740..4d2bd942b9 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1729,6 +1729,11 @@ public class MessageHelper {
                     warnings.add(context.getString(R.string.title_no_charset, charset));
 
                 if (part.isMimeType("text/plain")) {
+                    if (Helper.isUTF8(result)) {
+                        Log.i("Charset plain=UTF8");
+                        result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+                    }
+
                     if ("flowed".equalsIgnoreCase(ct.getParameter("format")))
                         result = HtmlHelper.flow(result);
                     result = "<div x-plain=\"true\">" + HtmlHelper.formatPre(result) + "</div>";