diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a1cf3594d3..c7f657f76d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1485,12 +1485,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }
 
             boolean confirm_images = prefs.getBoolean("confirm_images", true);
-            boolean confirm_html = prefs.getBoolean("confirm_html", true);
-
-            if (!confirm_images)
+            if (!confirm_images && !properties.getValue("images_asked", message.id)) {
                 properties.setValue("images", message.id, true);
-            if (!confirm_html)
+                properties.setValue("images_asked", message.id, true);
+            }
+
+            boolean confirm_html = prefs.getBoolean("confirm_html", true);
+            if (!confirm_html && !properties.getValue("full_asked", message.id)) {
                 properties.setValue("full", message.id, true);
+                properties.setValue("full_asked", message.id, true);
+            }
 
             boolean show_full = properties.getValue("full", message.id);
             boolean show_images = properties.getValue("images", message.id);