diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 0196b6cc73..1fb854162e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3548,7 +3548,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             properties.setHeight(message.id, null);
             properties.setPosition(message.id, null);
 
-            setupTools(message, false, true);
+            if (BuildConfig.DEBUG)
+                setupTools(message, false, true);
+            else
+                bindBody(message, false);
         }
 
         private void onShowImagesConfirmed(TupleMessageEx message) {