diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b7df9cb4b4..bf4fb320f8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5087,6 +5087,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     }
 
     public void collapse(@NonNull ViewHolder holder, int position) {
+        int type = holder.getItemViewType();
+        if (type != R.layout.item_message_compact && type != R.layout.item_message_normal)
+            return;
+
         TupleMessageEx message = getItemAtPosition(position);
         if (message != null)
             holder.clearExpanded(message);