diff --git a/app/src/main/res/layout/item_received_message.xml b/app/src/main/res/layout/item_received_message.xml
index 7ea3c0ed..7d476239 100644
--- a/app/src/main/res/layout/item_received_message.xml
+++ b/app/src/main/res/layout/item_received_message.xml
@@ -53,6 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/thread_mesage_attachments_holder"
             android:layout_toEndOf="@+id/thread_message_sender_photo"
+            android:autoLink="email|web"
             android:background="@drawable/item_received_background"
             android:padding="@dimen/normal_margin"
             android:textSize="@dimen/normal_text_size"
diff --git a/app/src/main/res/layout/item_sent_message.xml b/app/src/main/res/layout/item_sent_message.xml
index 24e8af73..0a420c0c 100644
--- a/app/src/main/res/layout/item_sent_message.xml
+++ b/app/src/main/res/layout/item_sent_message.xml
@@ -43,6 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/thread_mesage_attachments_holder"
             android:layout_alignParentEnd="true"
+            android:autoLink="email|web"
             android:background="@drawable/item_sent_background"
             android:padding="@dimen/normal_margin"
             android:textSize="@dimen/normal_text_size"