diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 502a7ea05d..1f6a3cc2cb 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1804,8 +1804,9 @@ public class MessageHelper {
                                     if (c.equals(StandardCharsets.UTF_8) && !CharsetHelper.isUTF8(result))
                                         break;
                                     if (CHARSET16.contains(c))
-                                        break;
-                                    Log.e("Converting meta=" + c);
+                                        break; // Can't convert 16 bits charset to 8 bits
+                                    Charset detected = CharsetHelper.detect(result);
+                                    Log.e("Converting detected=" + detected + " meta=" + c);
                                     result = new String(result.getBytes(StandardCharsets.ISO_8859_1), c);
                                     break;
                                 } catch (Throwable ex) {