diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 2dd8631aafc70368a9e2a3544b12bda701ffb9da..4304dc909695ccf0b2b24f09ef88e83970c907fb 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -36,7 +36,8 @@
       android:layout_marginBottom="@dimen/message_vertical"
       android:layout_marginEnd="@dimen/message_horizontal"
       android:layout_marginRight="@dimen/message_horizontal"
-      android:layout_marginTop="@dimen/message_vertical">
+      android:layout_marginTop="@dimen/message_vertical"
+      android:visibility="gone">
 
       <ImageView
         android:id="@+id/avatar"
@@ -61,34 +62,48 @@
         android:visibility="gone"
         tools:text="@sample/messages.json/data/sender" />
 
-      <de.kuschku.quasseldroid.ui.chat.messages.RipplePassthroughTextView
-        android:id="@+id/content"
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/message_vertical"
-        android:textColor="?attr/colorForeground"
-        android:visibility="gone"
-        tools:text="@sample/messages.json/data/message" />
+        android:orientation="horizontal">
 
-      <de.kuschku.quasseldroid.ui.chat.messages.RipplePassthroughTextView
-        android:id="@+id/combined"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?attr/colorForeground"
-        tools:text="@sample/messages.json/data/message" />
-    </LinearLayout>
+        <LinearLayout
+          android:layout_width="0dip"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="vertical">
 
-    <TextView
-      android:id="@+id/time_right"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="top"
-      android:layout_marginLeft="@dimen/message_horizontal"
-      android:layout_marginStart="@dimen/message_horizontal"
-      android:textColor="?attr/colorForegroundSecondary"
-      android:typeface="monospace"
-      android:visibility="gone"
-      tools:text="@sample/messages.json/data/time" />
+          <de.kuschku.quasseldroid.ui.chat.messages.RipplePassthroughTextView
+            android:id="@+id/content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/message_vertical"
+            android:textColor="?attr/colorForeground"
+            android:visibility="gone"
+            tools:text="@sample/messages.json/data/message" />
+
+          <de.kuschku.quasseldroid.ui.chat.messages.RipplePassthroughTextView
+            android:id="@+id/combined"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/colorForeground"
+            tools:text="@sample/messages.json/data/message" />
+
+        </LinearLayout>
+
+        <TextView
+          android:id="@+id/time_right"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="top"
+          android:layout_marginLeft="@dimen/message_horizontal"
+          android:layout_marginStart="@dimen/message_horizontal"
+          android:textColor="?attr/colorForegroundSecondary"
+          android:typeface="monospace"
+          android:visibility="gone"
+          tools:text="@sample/messages.json/data/time" />
+      </LinearLayout>
+    </LinearLayout>
   </LinearLayout>
 
   <View