diff --git a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
index 983d6882dcbfd19f38a522e6ffb6c930aa81f0c3..6e0788dd0c51f6b20511e412b2a0633404b5b7f6 100644
--- a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
+++ b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
@@ -388,8 +388,15 @@ class ConversationAdapter(
                         replyView.isVisible = true
                         conversationViewHolder.mReplyTxt!!.isVisible = true
                         conversationViewHolder.mInReplyTo!!.isVisible = true
-                        replyView.setOnClickListener {
-                            i.first.messageId?.let { presenter.scrollToMessage(it) }
+
+                        // User can click on mReplyTxt (replied message),
+                        // mInReplyTo or mReplyName (text above the message) to go to it.
+                        listOf(conversationViewHolder.mReplyTxt,
+                            conversationViewHolder.mInReplyTo,
+                            replyView).forEach{
+                            it.setOnClickListener{
+                                i.first.messageId?.let { presenter.scrollToMessage(it) }
+                            }
                         }
                     }) {
                         replyView.isVisible = false