diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt
index b074efe..8af04a4 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt
@@ -307,7 +307,8 @@ fun MessageBubble(
             Box(
                 modifier = Modifier
                     .padding(end = 12.dp)
-                    .widthIn(max = 280.dp)
+                    .widthIn(min = 60.dp, max = 280.dp)
+                    .wrapContentWidth(unbounded = false)
                     .graphicsLayer {
                         this.alpha = selectionAlpha
                         this.scaleX = selectionScale
@@ -336,13 +337,14 @@ fun MessageBubble(
 
                     Row(
                         verticalAlignment = Alignment.Bottom,
-                        horizontalArrangement = Arrangement.spacedBy(10.dp)
+                        horizontalArrangement = Arrangement.spacedBy(10.dp),
+                        modifier = Modifier.wrapContentWidth()
                     ) {
                         AppleEmojiText(
                             text = message.text,
                             color = textColor,
                             fontSize = 17.sp,
-                            modifier = Modifier.weight(1f, fill = true)
+                            modifier = Modifier.wrapContentWidth()
                         )
 
                         Row(