diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8817e40481..d52aa42fbd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1196,12 +1196,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         @Override
         public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
             TupleMessageEx message = getMessage(viewHolder);
-            if (message == null)
+            if (message == null) {
+                super.clearView(rvMessage, viewHolder);
                 return;
+            }
 
             TupleAccountSwipes swipes = accountSwipes.get(message.account);
-            if (swipes == null)
+            if (swipes == null) {
+                super.clearView(rvMessage, viewHolder);
                 return;
+            }
 
             Log.i("Swiped dir=" + direction + " message=" + message.id);