diff --git a/app/src/main/res/layout/item_custom_incoming_preview_message.xml b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
index b3c440355..250712aab 100644
--- a/app/src/main/res/layout/item_custom_incoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
@@ -56,10 +56,10 @@
                 android:id="@id/messageText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:autoLink="none"
+                android:autoLink="all"
                 android:textColor="@color/warm_grey_four"
                 android:textColorLink="@color/warm_grey_four"
-                android:textIsSelectable="true"
+                android:textIsSelectable="false"
                 android:textSize="12sp"
                 app:layout_alignSelf="flex_start"
                 app:layout_flexGrow="1"
diff --git a/app/src/main/res/layout/item_custom_incoming_text_message.xml b/app/src/main/res/layout/item_custom_incoming_text_message.xml
index 3d5b7904e..af19c067b 100644
--- a/app/src/main/res/layout/item_custom_incoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_text_message.xml
@@ -61,7 +61,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:lineSpacingMultiplier="1.2"
-            android:textIsSelectable="true"
+            android:textIsSelectable="false"
+            android:autoLink="all"
             app:layout_alignSelf="flex_start"
             app:layout_flexGrow="1"
             app:layout_wrapBefore="true" />
diff --git a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
index f73f1ec75..03132625e 100644
--- a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
@@ -55,10 +55,10 @@
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:autoLink="none"
+            android:autoLink="all"
             android:textColor="@color/warm_grey_four"
             android:textColorLink="@color/warm_grey_four"
-            android:textIsSelectable="true"
+            android:textIsSelectable="false"
             android:textSize="12sp"
             app:layout_alignSelf="flex_start"
             app:layout_flexGrow="1"
diff --git a/app/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
index 1c73de22b..b27dd504e 100644
--- a/app/src/main/res/layout/item_custom_outcoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
@@ -50,7 +50,8 @@
             app:layout_flexGrow="1"
             app:layout_wrapBefore="true"
             android:textColorHighlight="@color/nc_grey"
-            android:textIsSelectable="true" />
+            android:textIsSelectable="false"
+            android:autoLink="all"/>
 
         <TextView
             android:id="@id/messageTime"