diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index bf4b67dcc7..9b16f8d0fa 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1471,9 +1471,12 @@ public class MessageHelper {
                             if (!TextUtils.isEmpty(charset))
                                 try {
                                     Log.i("Charset=" + meta);
+                                    Charset c = Charset.forName(charset);
+                                    if (c.equals(StandardCharsets.UTF_8) && !Helper.isUTF8(result))
+                                        break;
                                     result = new String(result.getBytes(StandardCharsets.ISO_8859_1), charset);
                                     break;
-                                } catch (UnsupportedEncodingException ex) {
+                                } catch (Throwable ex) {
                                     Log.w(ex);
                                 }
                         }