diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/Room.kt b/app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/Room.kt
index 9625fb3..12a3cf4 100755
--- a/app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/Room.kt
+++ b/app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/Room.kt
@@ -397,7 +397,7 @@ private fun buildTimelineItems(
                         timestampMs != null &&
                         timestampMs - previousMessage.timestampMs <= MESSAGE_GROUP_WINDOW_MS
 
-                if (groupedWithPrevious && previousGroup != null && lastMessageGroupIndex != null) {
+                if (groupedWithPrevious) {
                     items[lastMessageGroupIndex] = previousGroup.copy(
                         messages = previousGroup.messages + message,
                     )
@@ -532,7 +532,10 @@ private fun MessageBubble(
     showSender: Boolean,
     showTimestamp: Boolean,
 ) {
-    val bubbleColor = MaterialTheme.colorScheme.surfaceVariant
+    val bubbleColor = if (item.senderId != client!!.userId.full)
+        MaterialTheme.colorScheme.surfaceContainer
+    else
+        MaterialTheme.colorScheme.primaryContainer
     val bubbleTextColor = MaterialTheme.colorScheme.onSurfaceVariant
 
     Column(