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 95b517d..8320091 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
@@ -314,7 +314,7 @@ private fun buildTimelineItems(
                     timestampMs != null &&
                     timestampMs - previousMessage.timestampMs <= MESSAGE_GROUP_WINDOW_MS
 
-                if (groupedWithPrevious && previousMessage != null && lastMessageIndex != null) {
+                if (groupedWithPrevious) {
                     items[lastMessageIndex] = previousMessage.copy(showTimestamp = false)
                 }
 
@@ -391,7 +391,10 @@ private fun SystemEventRow(item: SystemTimelineItem) {
 
 @Composable
 private fun MessageRow(item: MessageTimelineItem) {
-    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
 
     Box(