diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index db271d4d8a..cd0c5e37f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -36,6 +36,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
             onItemPress = { message, position ->
                 handlePress(message, position)
             },
+            onItemSwipeToReply = { message, position ->
+                handleSwipeToReply(message, position)
+            },
             onItemLongPress = { message, position ->
                 handleLongPress(message, position)
             }
@@ -109,10 +112,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    private fun reply(messagePosition: Int) {
-        Log.d("Loki", "Reply to message at position: $messagePosition.")
-    }
-
+    // `position` is the adapter position; not the visual position
     private fun handlePress(message: MessageRecord, position: Int) {
         val actionMode = this.actionMode
         if (actionMode != null) {
@@ -126,6 +126,12 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
         }
     }
 
+    // `position` is the adapter position; not the visual position
+    private fun handleSwipeToReply(message: MessageRecord, position: Int) {
+
+    }
+
+    // `position` is the adapter position; not the visual position
     private fun handleLongPress(message: MessageRecord, position: Int) {
         val actionMode = this.actionMode
         val actionModeCallback = ConversationActionModeCallback(adapter, threadID, this)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 7ddf025c0a..abb9b5d518 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -17,7 +17,8 @@ import org.thoughtcrime.securesms.loki.utilities.getColorWithID
 import java.lang.IllegalStateException
 
 class ConversationAdapter(context: Context, cursor: Cursor, private val onItemPress: (MessageRecord, Int) -> Unit,
-    private val onItemLongPress: (MessageRecord, Int) -> Unit) : CursorRecyclerViewAdapter<ViewHolder>(context, cursor) {
+    private val onItemSwipeToReply: (MessageRecord, Int) -> Unit, private val onItemLongPress: (MessageRecord, Int) -> Unit)
+    : CursorRecyclerViewAdapter<ViewHolder>(context, cursor) {
     private val messageDB = DatabaseFactory.getMmsSmsDatabase(context)
     var selectedItems = mutableSetOf<MessageRecord>()
 
@@ -73,6 +74,9 @@ class ConversationAdapter(context: Context, cursor: Cursor, private val onItemPr
                 view.messageTimestampTextView.isVisible = isSelected
                 val position = viewHolder.adapterPosition
                 view.bind(message, getMessageBefore(position, cursor), getMessageAfter(position, cursor))
+                view.onPress = { onItemPress(message, viewHolder.adapterPosition) }
+                view.onSwipeToReply = { onItemSwipeToReply(message, viewHolder.adapterPosition) }
+                view.onLongPress = { onItemLongPress(message, viewHolder.adapterPosition) }
             }
             is ControlMessageViewHolder -> viewHolder.view.bind(message)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 15fdbdacef..e0eb7b342f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -5,7 +5,6 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.util.AttributeSet
-import android.util.Log
 import android.view.*
 import android.widget.LinearLayout
 import androidx.core.view.isVisible
@@ -27,11 +26,15 @@ class VisibleMessageView : LinearLayout {
     private var previousTranslationX = 0.0f
     private val gestureHandler = Handler(Looper.getMainLooper())
     private var longPressCallback: Runnable? = null
+    private var onDownTimestamp = 0L
+    var onPress: (() -> Unit)? = null
+    var onSwipeToReply: (() -> Unit)? = null
+    var onLongPress: (() -> Unit)? = null
 
     companion object {
         const val swipeToReplyThreshold = 90.0f // dp
         const val longPressMovementTreshold = 10.0f // dp
-        const val longPressDurationThreshold = 250.0f // ms
+        const val longPressDurationThreshold = 250L // ms
     }
 
     // region Lifecycle
@@ -150,13 +153,11 @@ class VisibleMessageView : LinearLayout {
 
     private fun onDown(event: MotionEvent) {
         dx = x - event.rawX
-        val oldLongPressCallback = longPressCallback
-        if (oldLongPressCallback != null) {
-            gestureHandler.removeCallbacks(oldLongPressCallback)
-        }
-        val longPressCallback = Runnable { onLongPress() }
-        this.longPressCallback = longPressCallback
-        gestureHandler.postDelayed(longPressCallback, VisibleMessageView.longPressDurationThreshold)
+        longPressCallback?.let { gestureHandler.removeCallbacks(it) }
+        val newLongPressCallback = Runnable { onLongPress() }
+        this.longPressCallback = newLongPressCallback
+        gestureHandler.postDelayed(newLongPressCallback, VisibleMessageView.longPressDurationThreshold)
+        onDownTimestamp = Date().time
     }
 
     private fun onMove(event: MotionEvent) {
@@ -164,10 +165,7 @@ class VisibleMessageView : LinearLayout {
         if (abs(translationX) < VisibleMessageView.longPressMovementTreshold) {
             return
         } else {
-            val longPressCallback = longPressCallback
-            if (longPressCallback != null) {
-                gestureHandler.removeCallbacks(longPressCallback)
-            }
+            longPressCallback?.let { gestureHandler.removeCallbacks(it) }
         }
         // The idea here is to asymptotically approach a maximum drag distance
         val damping = 50.0f
@@ -186,7 +184,10 @@ class VisibleMessageView : LinearLayout {
 
     private fun onFinish(event: MotionEvent) {
         if (abs(translationX) > VisibleMessageView.swipeToReplyThreshold) {
-            Log.d("Test", "Reply")
+            onSwipeToReply?.invoke()
+        } else if ((Date().time - onDownTimestamp) < VisibleMessageView.longPressDurationThreshold) {
+            longPressCallback?.let { gestureHandler.removeCallbacks(it) }
+            onPress?.invoke()
         }
         animate()
             .translationX(0.0f)
@@ -196,7 +197,7 @@ class VisibleMessageView : LinearLayout {
 
     private fun onLongPress() {
         performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
-        Log.d("Test", "Long press")
+        onLongPress?.invoke()
     }
     // endregion
-}
\ No newline at end of file
+}