diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index aed5e09e5d..e70cd59111 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3255,6 +3255,9 @@ public class FragmentMessages extends FragmentBase
         }
 
         private void redraw(RecyclerView.ViewHolder vh) {
+            if (itemTouchHelper != null)
+                itemTouchHelper.onChildViewDetachedFromWindow(vh.itemView);
+
             rvMessage.post(new RunnableEx("redraw") {
                 @Override
                 public void delegate() {
@@ -3273,9 +3276,6 @@ public class FragmentMessages extends FragmentBase
                         else
                             adapter.notifyItemChanged(pos);
                     }
-
-                    if (vh != null && itemTouchHelper != null)
-                        itemTouchHelper.startSwipe(vh);
                 }
             });
         }