diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index e0bea64c9e..16545c6f15 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -150,7 +150,7 @@
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="?conversation_received_text_secondary_color"
                     android:fontFamily="sans-serif-light"
-                    android:autoLink="all"
+                    android:autoLink="none"
                     android:linksClickable="false" />
 		    </LinearLayout>
         </LinearLayout>
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 42b709e395..c566c16c5f 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -145,7 +145,7 @@
 		                android:paddingTop="1dip"/>
 
 		      <TextView android:id="@+id/conversation_item_date"
-		                android:autoLink="all"
+		                android:autoLink="none"
 		                android:layout_width="wrap_content"
 		                android:layout_height="wrap_content"
 		                android:linksClickable="false"