diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d7aadb1212..c28c25fe26 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3374,7 +3374,10 @@ public class FragmentMessages extends FragmentBase
 
                 @Override
                 protected void onExecuted(Bundle args, ArrayList<MessageTarget> result) {
-                    moveUndo(result);
+                    if (result == null || result.size() == 0)
+                        redraw(NO_POSITION);
+                    else
+                        moveUndo(result);
                 }
 
                 @Override