diff --git a/design-library/src/main/kotlin/app/dapk/st/design/components/Theme.kt b/design-library/src/main/kotlin/app/dapk/st/design/components/Theme.kt
index c1e37c2..95f2e98 100644
--- a/design-library/src/main/kotlin/app/dapk/st/design/components/Theme.kt
+++ b/design-library/src/main/kotlin/app/dapk/st/design/components/Theme.kt
@@ -31,8 +31,8 @@ private fun createExtended(scheme: ColorScheme) = ExtendedColors(
     onSelfBubble = scheme.onPrimary,
     othersBubble = scheme.secondaryContainer,
     onOthersBubble = scheme.onSecondaryContainer,
-    selfBubbleReplyBackground = Color(0x40EAEAEA),
-    otherBubbleReplyBackground = Color(0x20EAEAEA),
+    selfBubbleReplyBackground = scheme.primary.copy(alpha = 0.2f),
+    otherBubbleReplyBackground = scheme.primary.copy(alpha = 0.2f),
     missingImageColors = listOf(
         Color(0xFFf7c7f7) to Color(0xFFdf20de),
         Color(0xFFe5d7f6) to Color(0xFF7b30cf),
diff --git a/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt b/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
index fa45f02..ca123c1 100644
--- a/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
+++ b/features/messenger/src/main/kotlin/app/dapk/st/messenger/MessengerScreen.kt
@@ -427,6 +427,7 @@ private fun ReplyBubbleContent(content: BubbleContent<RoomEvent.Reply>) {
                 val context = LocalContext.current
                 Column(
                     Modifier
+                        .fillMaxWidth()
                         .background(if (content.isNotSelf) SmallTalkTheme.extendedColors.otherBubbleReplyBackground else SmallTalkTheme.extendedColors.selfBubbleReplyBackground)
                         .padding(4.dp)
                 ) {
@@ -436,13 +437,13 @@ private fun ReplyBubbleContent(content: BubbleContent<RoomEvent.Reply>) {
                         fontSize = 11.sp,
                         text = replyName,
                         maxLines = 1,
-                        color = MaterialTheme.colorScheme.onPrimary
+                        color = content.textColor()
                     )
                     when (val replyingTo = content.message.replyingTo) {
                         is Message -> {
                             Text(
                                 text = replyingTo.content,
-                                color = MaterialTheme.colorScheme.onPrimary,
+                                color = content.textColor(),
                                 fontSize = 15.sp,
                                 modifier = Modifier.wrapContentSize(),
                                 textAlign = TextAlign.Start,