diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 06a5f7caf6..b68a13d67f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -741,6 +741,9 @@ public class FragmentMessages extends FragmentBase {
 
             Log.i("Swiped dir=" + direction + " message=" + message.id);
 
+            if (selectionPredicate != null)
+                selectionPredicate.setEnabled(false);
+
             Bundle args = new Bundle();
             args.putLong("id", message.id);
             args.putBoolean("thread", viewType != AdapterMessage.ViewType.THREAD);
@@ -1950,6 +1953,9 @@ public class FragmentMessages extends FragmentBase {
                 return;
             }
 
+            if (selectionPredicate != null)
+                selectionPredicate.setEnabled(true);
+
             if (viewType == AdapterMessage.ViewType.THREAD) {
                 // Mark duplicates
                 Map<String, List<TupleMessageEx>> duplicates = new HashMap<>();