diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/TypographyCompose.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/TypographyCompose.kt
index 1295db15df..99b9e50797 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/TypographyCompose.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/TypographyCompose.kt
@@ -2,12 +2,12 @@ package com.anytypeio.anytype.core_ui.views
 
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontLoadingStrategy
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
 import com.anytypeio.anytype.core_ui.R
 
 val fontInterRegular = FontFamily(
@@ -96,6 +96,15 @@ val BodyRegular = TextStyle(
     letterSpacing = (-0.024).em
 )
 
+//Content/Misc/Chat
+val ContentMiscChat = TextStyle(
+    fontFamily = fontInterRegular,
+    fontWeight = FontWeight.W400,
+    fontSize = 17.sp,
+    lineHeight = 20.sp,
+    letterSpacing = (-0.024).em
+)
+
 //Content/Body/Italic
 val BodyItalic = TextStyle(
     fontFamily = fontInterRegular,
diff --git a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt
index a49374e98a..fd40c84919 100644
--- a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt
+++ b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt
@@ -46,7 +46,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.colorResource
@@ -54,7 +53,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -64,15 +62,13 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import com.anytypeio.anytype.core_models.Url
-import com.anytypeio.anytype.core_models.primitives.Space
-import com.anytypeio.anytype.core_ui.common.DEFAULT_DISABLED_ALPHA
 import com.anytypeio.anytype.core_ui.common.DefaultPreviews
 import com.anytypeio.anytype.core_ui.common.FULL_ALPHA
 import com.anytypeio.anytype.core_ui.foundation.Divider
 import com.anytypeio.anytype.core_ui.foundation.noRippleClickable
-import com.anytypeio.anytype.core_ui.views.BodyRegular
 import com.anytypeio.anytype.core_ui.views.Caption1Medium
 import com.anytypeio.anytype.core_ui.views.Caption1Regular
+import com.anytypeio.anytype.core_ui.views.ContentMiscChat
 import com.anytypeio.anytype.feature_chats.R
 import com.anytypeio.anytype.feature_chats.presentation.ChatView
 import com.anytypeio.anytype.feature_chats.presentation.ChatViewModel.ChatBoxMode
@@ -567,7 +563,7 @@ private fun ChatBoxUserInput(
             onValueChange(newValue, updatedSpans)
 
         },
-        textStyle = BodyRegular.copy(
+        textStyle = ContentMiscChat.copy(
             color = colorResource(id = R.color.text_primary)
         ),
         modifier = modifier
@@ -582,7 +578,7 @@ private fun ChatBoxUserInput(
                 text = text.text,
                 hint = stringResource(R.string.write_a_message),
                 innerTextField = innerTextField,
-                textStyle = BodyRegular.copy(color = colorResource(R.color.text_tertiary))
+                textStyle = ContentMiscChat.copy(color = colorResource(R.color.text_tertiary))
             )
         },
         visualTransformation = AnnotatedTextTransformation(spans)
diff --git a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBubble.kt b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBubble.kt
index 2672514a30..69032e1f0d 100644
--- a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBubble.kt
+++ b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBubble.kt
@@ -60,16 +60,15 @@ import com.anytypeio.anytype.core_ui.foundation.BUTTON_WARNING
 import com.anytypeio.anytype.core_ui.foundation.Divider
 import com.anytypeio.anytype.core_ui.foundation.GRADIENT_TYPE_RED
 import com.anytypeio.anytype.core_ui.foundation.GenericAlert
-import com.anytypeio.anytype.core_ui.views.BodyRegular
 import com.anytypeio.anytype.core_ui.views.Caption1Medium
 import com.anytypeio.anytype.core_ui.views.Caption1Regular
 import com.anytypeio.anytype.core_ui.views.Caption2Regular
+import com.anytypeio.anytype.core_ui.views.ContentMiscChat
 import com.anytypeio.anytype.core_ui.views.fontIBM
 import com.anytypeio.anytype.core_utils.const.DateConst.TIME_H24
 import com.anytypeio.anytype.core_utils.ext.formatTimeInMillis
 import com.anytypeio.anytype.feature_chats.R
 import com.anytypeio.anytype.feature_chats.presentation.ChatView
-import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -159,7 +158,7 @@ fun Bubble(
         // Rendering text with attachments
         Column(
             modifier = Modifier
-                .fillMaxWidth()
+                .wrapContentWidth()
                 .background(
                     color = if (!isUserAuthor)
                         colorResource(R.color.background_primary)
@@ -248,15 +247,6 @@ fun Bubble(
                                     }
                                 }
                             }
-                            if (isEdited) {
-                                withStyle(
-                                    style = SpanStyle(color = colorResource(id = R.color.text_tertiary))
-                                ) {
-                                    append(
-                                        " (${stringResource(R.string.chats_message_edited)})"
-                                    )
-                                }
-                            }
 
                             withStyle(
                                 style = SpanStyle(
@@ -264,22 +254,31 @@ fun Bubble(
                                 )
                             ) {
                                 append(
-                                    timestamp.formatTimeInMillis(
-                                        TIME_H24
-                                    )
+                                    timestamp.formatTimeInMillis(TIME_H24).let {
+                                        if (isEdited) {
+                                            "${stringResource(R.string.chats_message_edited)} $it"
+                                        } else {
+                                            it
+                                        }
+                                    }
                                 )
                             }
                         },
-                        style = BodyRegular,
+                        style = ContentMiscChat,
                         color = colorResource(id = R.color.text_primary),
                     )
                     // Rendering message timestamp
+
                     Text(
                         modifier = Modifier
                             .align(Alignment.BottomEnd),
-                        text = timestamp.formatTimeInMillis(
-                            TIME_H24
-                        ),
+                        text = timestamp.formatTimeInMillis(TIME_H24).let {
+                            if (isEdited) {
+                                "${stringResource(R.string.chats_message_edited)} $it"
+                            } else {
+                                it
+                            }
+                        },
                         style = Caption2Regular,
                         color = colorResource(id = R.color.transparent_active),
                         maxLines = 1