diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index fe73c5f46d478d1708c99fe1b9564cdd3bed90e4..b735422fcaf8c42cb0779d7ef3746d30b81a7cc6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -110,10 +110,10 @@ class QuasselMessageRenderer @Inject constructor(
 
     val textSize = messageSettings.textSize.toFloat()
     viewHolder.timeLeft?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
-    viewHolder.timeRight?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
+    viewHolder.timeRight?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize * 0.9f)
     viewHolder.content?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
     viewHolder.combined?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
-    viewHolder.name?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize * 0.8f)
+    viewHolder.name?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
   }
 
   override fun bind(holder: MessageAdapter.QuasselMessageViewHolder, message: FormattedMessage,
diff --git a/app/src/main/res/layout/widget_chatmessage_action.xml b/app/src/main/res/layout/widget_chatmessage_action.xml
index 86b9479b3fb230a56bbdbd98fca11d3e1d5b0523..41dd1b815c43f83c9865fb1bf4bb2bf6cbf18aea 100644
--- a/app/src/main/res/layout/widget_chatmessage_action.xml
+++ b/app/src/main/res/layout/widget_chatmessage_action.xml
@@ -50,13 +50,15 @@
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
+      android:layout_gravity="top"
       android:layout_marginLeft="@dimen/message_horizontal"
       android:layout_marginStart="@dimen/message_horizontal"
       android:textColor="?attr/colorForegroundSecondary"
-      android:typeface="monospace"
+      android:textStyle="italic"
       android:visibility="gone"
-      tools:text="@sample/messages.json/data/time" />
+      tools:text="@sample/messages.json/data/time"
+      tools:textSize="11.9sp"
+      tools:visibility="visible" />
   </LinearLayout>
 
   <View
diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml
index ae61a603494fa5ee985ee65599c099608897e2a9..d4d257e64d66d12cd02ed69c144907811a1e44ae 100644
--- a/app/src/main/res/layout/widget_chatmessage_error.xml
+++ b/app/src/main/res/layout/widget_chatmessage_error.xml
@@ -48,13 +48,15 @@
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
+      android:layout_gravity="top"
       android:layout_marginLeft="@dimen/message_horizontal"
       android:layout_marginStart="@dimen/message_horizontal"
       android:textColor="?attr/colorForegroundSecondary"
-      android:typeface="monospace"
+      android:textStyle="italic"
       android:visibility="gone"
-      tools:text="@sample/messages.json/data/time" />
+      tools:text="@sample/messages.json/data/time"
+      tools:textSize="11.9sp"
+      tools:visibility="visible" />
   </LinearLayout>
 
   <View
diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml
index ff9c13fc6a9bc9a8f888a1652e5cc50cd78ca64c..ea23ac62093252f18017a89c7d37bd5ad85be230 100644
--- a/app/src/main/res/layout/widget_chatmessage_info.xml
+++ b/app/src/main/res/layout/widget_chatmessage_info.xml
@@ -49,13 +49,15 @@
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
+      android:layout_gravity="top"
       android:layout_marginLeft="@dimen/message_horizontal"
       android:layout_marginStart="@dimen/message_horizontal"
       android:textColor="?attr/colorForegroundSecondary"
-      android:typeface="monospace"
+      android:textStyle="italic"
       android:visibility="gone"
-      tools:text="@sample/messages.json/data/time" />
+      tools:text="@sample/messages.json/data/time"
+      tools:textSize="11.9sp"
+      tools:visibility="visible" />
   </LinearLayout>
 
   <View
diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml
index f66865be86522c7e5bf1f77ae59918c336f75f07..799351f070a070ac5af710d806cefd6b49a75b34 100644
--- a/app/src/main/res/layout/widget_chatmessage_notice.xml
+++ b/app/src/main/res/layout/widget_chatmessage_notice.xml
@@ -48,13 +48,15 @@
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
+      android:layout_gravity="top"
       android:layout_marginLeft="@dimen/message_horizontal"
       android:layout_marginStart="@dimen/message_horizontal"
       android:textColor="?attr/colorForegroundSecondary"
-      android:typeface="monospace"
+      android:textStyle="italic"
       android:visibility="gone"
-      tools:text="@sample/messages.json/data/time" />
+      tools:text="@sample/messages.json/data/time"
+      tools:textSize="11.9sp"
+      tools:visibility="visible" />
   </LinearLayout>
 
   <View
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 4736656af04047faf27572e7ccefb6948a24bd52..38c87d96b3016e89190f5018f4ad0d8d79782670 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -34,10 +34,8 @@
       android:id="@+id/avatar_container"
       android:layout_width="@dimen/avatar_size"
       android:layout_height="wrap_content"
-      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:visibility="gone"
       tools:visibility="visible">
 
@@ -105,8 +103,9 @@
           android:layout_marginLeft="@dimen/message_horizontal"
           android:layout_marginStart="@dimen/message_horizontal"
           android:textColor="?attr/colorForegroundSecondary"
-          android:textSize="11.9sp"
+          android:textStyle="italic"
           android:visibility="gone"
+          tools:textSize="11.9sp"
           tools:text="@sample/messages.json/data/time"
           tools:visibility="visible" />
       </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index cd3e728a1c8d81f95daeecaa17662b12b370b31e..1dc66be33140f82dbde5476b1005f0d3badb9243 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -48,13 +48,15 @@
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
+      android:layout_gravity="top"
       android:layout_marginLeft="@dimen/message_horizontal"
       android:layout_marginStart="@dimen/message_horizontal"
       android:textColor="?attr/colorForegroundSecondary"
-      android:typeface="monospace"
+      android:textStyle="italic"
       android:visibility="gone"
-      tools:text="@sample/messages.json/data/time" />
+      tools:text="@sample/messages.json/data/time"
+      tools:textSize="11.9sp"
+      tools:visibility="visible" />
   </LinearLayout>
 
   <View