diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c24a2f52c2..8e77ff91ad 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1203,6 +1203,8 @@ public class FragmentMessages extends FragmentBase
                         public void onLongPress(@NonNull MotionEvent e) {
                             if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
                                 return;
+                            if (swiping)
+                                return;
 
                             int x = Math.round(e.getX());
                             int y = Math.round(e.getY());
@@ -1257,9 +1259,6 @@ public class FragmentMessages extends FragmentBase
 
             @Override
             public boolean onInterceptTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) {
-                if (swiping)
-                    e = MotionEvent.obtain(e.getDownTime(), e.getEventTime(),
-                            MotionEvent.ACTION_CANCEL, e.getX(), e.getY(), 0);
                 gestureDetector.onTouchEvent(e);
                 return false;
             }