diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index e70cd59111..597c885f0e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3255,7 +3255,7 @@ public class FragmentMessages extends FragmentBase
         }
 
         private void redraw(RecyclerView.ViewHolder vh) {
-            if (itemTouchHelper != null)
+            if (vh != null && itemTouchHelper != null)
                 itemTouchHelper.onChildViewDetachedFromWindow(vh.itemView);
 
             rvMessage.post(new RunnableEx("redraw") {