diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index d75108f262..e061acf09e 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -431,7 +431,8 @@ public class ActivityEML extends ActivityBase {
                             .append(size > 0 ? Helper.humanReadableByteCount(size) : "?")
                             .append('\n');
 
-                    if (!part.isMimeType("multipart/*")) {
+                    if (BuildConfig.DEBUG &&
+                            !part.isMimeType("multipart/*")) {
                         Object content = part.getContent();
                         if (content instanceof String) {
                             String text = (String) content;