diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 73567defad..44c30ab44d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5142,16 +5142,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         holder.wire();
     }
 
-    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);
-    }
-
     public void onItemSelected(@NonNull ViewHolder holder, boolean selected) {
         if (accessibility && holder.view != null)
             try {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 07a31448cf..52eb1ee1b8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1474,11 +1474,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         int pos = adapter.getPositionForKey(other);
                         if (pos == NO_POSITION)
                             continue;
-                        AdapterMessage.ViewHolder holder =
-                                (AdapterMessage.ViewHolder) rvMessage.findViewHolderForAdapterPosition(pos);
-                        if (holder == null)
-                            continue;
-                        adapter.collapse(holder, pos);
+
+                        adapter.notifyItemChanged(pos);
                     }
             }