diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6ca406b850..87be19daeb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -563,7 +563,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         }
 
         private void onShowImages(EntityMessage message) {
-            properties.setImages(message.id, !properties.showImages(message.id));
+            properties.setImages(message.id, true);
+            btnImages.setEnabled(false);
 
             Bundle args = new Bundle();
             args.putSerializable("message", message);