diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
index d7a5dcdbdd48dd750d23a767ae6385ea08089e39..c52c8e00fd8d702b9739d0f1712bd42ed39a6591 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
@@ -210,6 +210,7 @@ class MessageAdapter(
             .placeholder(message.fallbackDrawable)
             .into(avatarView)
         } else {
+          GlideApp.with(itemView).clear(avatarView)
           avatarView.setImageDrawable(message.fallbackDrawable)
         }
       }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index aa0234f3b271727a33f0e8d7a8b63dfb680409d1..b8a983601478786cf48c341d5b6ada2b64a44623 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -235,7 +235,6 @@ class MessageListFragment : ServiceBoundFragment() {
     messageList.adapter = adapter
     messageList.layoutManager = linearLayoutManager
     messageList.itemAnimator = null
-    messageList.setItemViewCacheSize(20)
 
     val senderColors = requireContext().theme.styledAttributes(
       R.attr.senderColor0, R.attr.senderColor1, R.attr.senderColor2, R.attr.senderColor3,
diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml
index 3e6cc388d02de1f8406e19c34bb16131f38dfbd9..12d904c15fe419866a66c32b5735a6477b50992d 100644
--- a/app/src/main/res/layout/widget_chatmessage_error.xml
+++ b/app/src/main/res/layout/widget_chatmessage_error.xml
@@ -17,6 +17,7 @@
     android:id="@+id/time_left"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_gravity="top"
     android:layout_marginEnd="@dimen/message_horizontal"
     android:layout_marginRight="@dimen/message_horizontal"
     android:textColor="?attr/colorForegroundSecondary"
diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml
index 8b304e287a05736443521063d8a6b3feeec1821e..bb275b6f8d31a1cce27a2780ac83b58e76df806f 100644
--- a/app/src/main/res/layout/widget_chatmessage_info.xml
+++ b/app/src/main/res/layout/widget_chatmessage_info.xml
@@ -17,10 +17,11 @@
     android:id="@+id/time_left"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_gravity="top"
     android:layout_marginEnd="@dimen/message_horizontal"
     android:layout_marginRight="@dimen/message_horizontal"
-    android:fontFamily="monospace"
     android:textColor="?attr/colorForegroundSecondary"
+    android:typeface="monospace"
     tools:text="@sample/messages.json/data/time" />
 
   <Space
diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml
index 5b18d8d8482aca067c60b7fee16296997f0eb3c0..d3e0e2760dc520c218adbb6fffb5ee8bec5b8605 100644
--- a/app/src/main/res/layout/widget_chatmessage_notice.xml
+++ b/app/src/main/res/layout/widget_chatmessage_notice.xml
@@ -17,10 +17,11 @@
     android:id="@+id/time_left"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_gravity="top"
     android:layout_marginEnd="@dimen/message_horizontal"
     android:layout_marginRight="@dimen/message_horizontal"
-    android:fontFamily="monospace"
-    android:textColor="?attr/colorForegroundNotice"
+    android:textColor="?attr/colorForegroundSecondary"
+    android:typeface="monospace"
     tools:text="@sample/messages.json/data/time" />
 
   <Space
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index 0981257a55309ae3e3c7a526182229e6bd34de0c..9bcccdfb2b96112c88cf32a23e690992f1a596a5 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -17,8 +17,9 @@
     android:id="@+id/time_left"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="@dimen/message_horizontal"
-    android:layout_marginStart="@dimen/message_horizontal"
+    android:layout_gravity="top"
+    android:layout_marginEnd="@dimen/message_horizontal"
+    android:layout_marginRight="@dimen/message_horizontal"
     android:textColor="?attr/colorForegroundSecondary"
     android:typeface="monospace"
     tools:text="@sample/messages.json/data/time" />