diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index dca872f0ad..e4ec35e412 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1481,6 +1481,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     if (amessage == null || !amessage.id.equals(id))
                         return;
 
+                    boolean show_expanded = properties.getValue("expanded", message.id);
+                    if (!show_expanded)
+                        return;
+
                     boolean hasArchive = false;
                     boolean hasTrash = false;
                     boolean hasJunk = false;
@@ -2049,6 +2053,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     if (amessage == null || !amessage.id.equals(id))
                         return;
 
+                    boolean show_expanded = properties.getValue("expanded", message.id);
+                    if (!show_expanded)
+                        return;
+
                     if (icalendar == null ||
                             icalendar.getMethod() == null ||
                             icalendar.getEvents().size() == 0) {