diff --git a/src/cheogram/java/com/cheogram/android/SwipeDetector.java b/src/cheogram/java/com/cheogram/android/SwipeDetector.java
index 943bfe2f0d92eabd4ccae17e2ecc5c95c6a851db..b7a5ce6d68d0d010f04debface793b462a0cf266 100644
--- a/src/cheogram/java/com/cheogram/android/SwipeDetector.java
+++ b/src/cheogram/java/com/cheogram/android/SwipeDetector.java
@@ -27,7 +27,7 @@ public class SwipeDetector implements View.OnTouchListener {
     }
 
     private static final String logTag = "Swipe";
-    private static final int MIN_DISTANCE = 39;
+    private static final int MIN_DISTANCE = 35;
     private float downX, downY, upX, upY;
     private Action mSwipeDetected = Action.None;
 
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 1a5ebb6136858517f1c0754d651a28712cc39623..e75c2b588e995437c9f8120d0cfc66d343914d1f 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -933,16 +933,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                         .onContactPictureClicked(message);
             }
         });
-        viewHolder.message_box.setOnTouchListener(new SwipeDetector((action) -> {
+        SwipeDetector swipeDetector = new SwipeDetector((action) -> {
             if (action == SwipeDetector.Action.LR && MessageAdapter.this.mOnMessageBoxSwipedListener != null) {
                 MessageAdapter.this.mOnMessageBoxSwipedListener.onContactPictureClicked(message);
             }
-        }));
-        viewHolder.messageBody.setOnTouchListener(new SwipeDetector((action) -> {
-            if (action == SwipeDetector.Action.LR && MessageAdapter.this.mOnMessageBoxSwipedListener != null) {
-                MessageAdapter.this.mOnMessageBoxSwipedListener.onContactPictureClicked(message);
-            }
-        }));
+        });
+        viewHolder.message_box.setOnTouchListener(swipeDetector);
+        viewHolder.messageBody.setOnTouchListener(swipeDetector);
+        viewHolder.image.setOnTouchListener(swipeDetector);
+        viewHolder.time.setOnTouchListener(swipeDetector);
         viewHolder.messageBody.setOnClickListener(v -> {
             if (MessageAdapter.this.mOnMessageBoxClickedListener != null) {
                 MessageAdapter.this.mOnMessageBoxClickedListener