diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 385904445d..8524db33ec 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5065,7 +5065,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             if (list != null)
                 for (int i = 0; i < list.size(); i++) {
                     TupleMessageEx message = list.get(i);
-                    if (message != null && properties.getValue("expanded", message.id))
+                    if (message != null &&
+                            (!message.content || message.attachments > 0) &&
+                            properties.getValue("expanded", message.id))
                         notifyItemChanged(i);
                 }
         }