diff --git a/res/layout/view_conversation.xml b/res/layout/view_conversation.xml
index 1311687555..0df9155353 100644
--- a/res/layout/view_conversation.xml
+++ b/res/layout/view_conversation.xml
@@ -36,19 +36,16 @@
 
             <TextView
                 android:id="@+id/btnGroupNameDisplay"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:maxLines="1"
                 android:ellipsize="end"
+                android:textAlignment="viewStart"
                 android:textSize="@dimen/medium_font_size"
                 android:textStyle="bold"
                 android:textColor="@color/text"
-                android:text="Spiderman" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+                android:text="I'm a very long display name. What are you going to do about it?" />
 
             <TextView
                 android:id="@+id/timestampTextView"
diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml
index a0d51412de..6d9aa37e09 100644
--- a/res/layout/view_user.xml
+++ b/res/layout/view_user.xml
@@ -21,11 +21,11 @@
 
         <TextView
             android:id="@+id/nameTextView"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/medium_spacing"
+            android:layout_marginStart="@dimen/medium_spacing"
             android:maxLines="1"
-            android:gravity="left"
+            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:textSize="@dimen/medium_font_size"
             android:textStyle="bold"
@@ -37,7 +37,7 @@
             android:id="@+id/actionIndicatorImageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginLeft="@dimen/medium_spacing"
+            android:layout_marginStart="@dimen/medium_spacing"
             android:src="@drawable/ic_circle" />
 
     </LinearLayout>