diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index ef630ee682..3546a3a987 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/conversation_view_background"
     android:gravity="center_vertical"
     android:orientation="horizontal">
@@ -50,7 +51,7 @@
                     android:textSize="@dimen/medium_font_size"
                     android:textStyle="bold"
                     android:textColor="@color/text"
-                    android:text="I'm a very long display name. What are you going to do about it?" />
+                    tools:text="I'm a very long display name. What are you going to do about it?" />
 
                 <TextView
                     android:id="@+id/timestampTextView"
@@ -82,7 +83,8 @@
                     android:layout_marginEnd="6dp" />
 
                 <RelativeLayout
-                    android:layout_width="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content">
 
                     <TextView
@@ -93,7 +95,7 @@
                         android:ellipsize="end"
                         android:textSize="@dimen/medium_font_size"
                         android:textColor="@color/text"
-                        android:text="Sorry, gotta go fight crime again" />
+                        tools:text="Sorry, gotta go fight crime again" />
 
                     <org.thoughtcrime.securesms.components.TypingIndicatorView
                         android:id="@+id/typingIndicatorView"
@@ -104,11 +106,6 @@
 
                 </RelativeLayout>
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
                 <ImageView
                     android:id="@+id/statusIndicatorImageView"
                     android:layout_width="@dimen/conversation_view_status_indicator_size"