diff --git a/ring-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.java b/ring-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.java
index 97e73bc07d7b1001a9a2c0ddd762041801d207c8..a571dc9403f77c1a92701465f2a80d46dcf3643e 100644
--- a/ring-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.java
+++ b/ring-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.java
@@ -81,7 +81,6 @@ import cx.ring.model.TextMessage;
 import cx.ring.service.DRingService;
 import cx.ring.utils.AndroidFileUtils;
 import cx.ring.utils.ContentUriHandler;
-import cx.ring.utils.FileUtils;
 import cx.ring.utils.GlideApp;
 import cx.ring.utils.GlideOptions;
 import cx.ring.utils.ResourceMapper;
@@ -296,9 +295,11 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationViewHo
             holder.player = null;
         }
         if (holder.mMsgTxt != null) {
-            holder.mMsgTxt.setOnClickListener(null);
             holder.mMsgTxt.setOnLongClickListener(null);
         }
+        if (holder.mItem != null) {
+            holder.mItem.setOnClickListener(null);
+        }
         if (expandedItemPosition == holder.getLayoutPosition()) {
             holder.mMsgDetailTxt.setVisibility(View.GONE);
             expandedItemPosition = -1;
@@ -764,7 +765,7 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationViewHo
                 }));
             }
             setItemViewExpansionState(convViewHolder, isExpanded);
-            convViewHolder.mMsgTxt.setOnClickListener((View v) -> {
+            convViewHolder.mItem.setOnClickListener((View v) -> {
                 if (convViewHolder.animator != null && convViewHolder.animator.isRunning()) {
                     return;
                 }
diff --git a/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java b/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java
index 79ab35c37cd1dfde78a8961bc6c6f5b49e50bf4b..1672d98607c7620c2ac0b6541ac754b86de095ff 100644
--- a/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java
+++ b/ring-android/app/src/main/java/cx/ring/views/ConversationViewHolder.java
@@ -40,6 +40,7 @@ import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
 
 public class ConversationViewHolder extends RecyclerView.ViewHolder {
+    public View mItem;
     public TextView mMsgTxt;
     public TextView mMsgDetailTxt;
     public TextView mMsgDetailTxtPerm;
@@ -79,6 +80,7 @@ public class ConversationViewHolder extends RecyclerView.ViewHolder {
                 // common layout elements
                 case INCOMING_TEXT_MESSAGE:
                 case OUTGOING_TEXT_MESSAGE:
+                    mItem = v.findViewById(R.id.txt_entry);
                     mMsgTxt = v.findViewById(R.id.msg_txt);
                     mMsgDetailTxt = v.findViewById(R.id.msg_details_txt);
                     mMsgDetailTxtPerm = v.findViewById(R.id.msg_details_txt_perm);
diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_me.xml b/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
index f7aa80612a350c2d8326efe73d171fe4b87a4094..35830d8d6307bba40a18a090df9576d725951a13 100644
--- a/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
@@ -72,7 +72,7 @@ along with this program; if not, write to the Free Software
             android:autoLink="all"
             android:background="@drawable/textmsg_bg_out"
             android:ellipsize="marquee"
-            android:focusable="false"
+            android:focusable="true"
             android:marqueeRepeatLimit="marquee_forever"
             android:padding="@dimen/padding_medium"
             android:scrollHorizontally="true"
diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml b/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
index 81584e8aeaa7c8dbc87ff7d87655f5fe23a30de0..43c011176cd7fc0a78e7dd333f2bdab56fff124d 100644
--- a/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
@@ -55,7 +55,7 @@ along with this program; if not, write to the Free Software
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/padding_medium"
-        android:paddingEnd="@dimen/padding_large">
+        android:paddingEnd="36dp">
 
         <ImageView
             android:id="@+id/photo"
@@ -77,7 +77,7 @@ along with this program; if not, write to the Free Software
             android:autoLink="all"
             android:background="@drawable/textmsg_bg_in"
             android:ellipsize="marquee"
-            android:focusable="false"
+            android:focusable="true"
             android:marqueeRepeatLimit="marquee_forever"
             android:scrollHorizontally="true"
             android:singleLine="false"