diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 4a1f0d99eb..d5aad8ea07 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1181,6 +1181,8 @@ public class MessageHelper {
                     charset = charset.replace("\"", "");
                     if ("ASCII".equals(charset.toUpperCase()))
                         charset = "US-ASCII";
+                    else if (charset.toLowerCase().endsWith("8859-16")) // not supported by Android
+                        charset = null; // Use ISO8859-1 instead
                 }
 
                 if (TextUtils.isEmpty(charset) || "US-ASCII".equals(charset.toUpperCase())) {