diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b1fd452f79..ecc7bfff04 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1589,8 +1589,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ConstraintLayout cl = (ConstraintLayout) flow.getParent();
             for (int id : flow.getReferencedIds()) {
                 View v = cl.findViewById(id);
-                flow.removeView(v);
-                cl.removeView(v);
+                // flow.removeView(v);
+                // cl.removeView(v);
+                // https://github.com/androidx/constraintlayout/issues/430
+                v.setVisibility(View.GONE);
             }
         }