diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d1759e8754..f3db86b3ec 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3238,6 +3238,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             @Override
             public void onClick(View v) {
                 snackbar.dismiss();
+                snackbar.getView().setTag(true);
 
                 Bundle args = new Bundle();
                 args.putParcelableArrayList("result", result);
@@ -3272,6 +3273,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             public void run() {
                 Log.i("Move timeout");
 
+                if (snackbar.getView().getTag() != null)
+                    return;
+
                 // Remove snackbar
                 if (snackbar.isShown())
                     snackbar.dismiss();