diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index ec985fcf4..82404d3f0 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -25,12 +25,14 @@
         android:layout_height="wrap_content"
         android:textSize="18sp"
         android:textColor="#5b5b5b"
+        android:singleLine="true"
         />
     <TextView 
         android:id="@+id/contact_jid"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="#5b5b5b"
+        android:singleLine="true"
         />
     </LinearLayout>
 
diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index 41747240e..469a0cde1 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -22,6 +22,9 @@
 	        android:id="@+id/conversation_name"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
+	        android:layout_alignLeft="@+id/conversation_lastmsg"
+	        android:layout_toLeftOf="@+id/conversation_lastupdate"
+	        android:singleLine="true"
 	        android:textColor="#636363"
 	        android:textSize="20sp"
 	        android:typeface="sans" />