diff --git a/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesPreparator.kt b/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesPreparator.kt
index 3cf1de56..89af81ac 100644
--- a/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesPreparator.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesPreparator.kt
@@ -118,7 +118,8 @@ class MessagesPreparator constructor(
             avatar?.visibility =
                 if (nextSenderDiff
                     || (fiveMinAgo && prevSenderDiff)
-                    || (!prevSenderDiff && nextMessage == null)
+                    || !prevSenderDiff
+                    || nextMessage == null
                 ) View.VISIBLE else View.INVISIBLE
         } else {
             title?.isVisible = false