diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 81a672e70f..135de85b11 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -8089,13 +8089,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     same = false;
                     log("uid changed", next.id);
 
-                    if (prev.uid == null && next.uid != null) { // once only
+                    if (prev.uid == null && next.uid != null && // once only
+                            properties.getValue("expanded", next.id)) {
                         // Mark seen when needed
                         if (!Boolean.TRUE.equals(next.ui_seen) && next.accountAutoSeen)
                             EntityOperation.queue(context, next, EntityOperation.SEEN, true);
 
                         // Download body when needed
-                        if (!next.content && properties.getValue("expanded", next.id))
+                        if (!next.content)
                             EntityOperation.queue(context, next, EntityOperation.BODY);
                     }
                 }