diff --git a/app/src/main/kotlin/com/meloda/fast/api/VkUtils.kt b/app/src/main/kotlin/com/meloda/fast/api/VkUtils.kt
index 2a195151..d6c4d7ce 100644
--- a/app/src/main/kotlin/com/meloda/fast/api/VkUtils.kt
+++ b/app/src/main/kotlin/com/meloda/fast/api/VkUtils.kt
@@ -512,7 +512,7 @@ object VkUtils {
         )?.toString()
     }
 
-    fun getForwardsConversationText(context: Context, message: VkMessage): String? {
+    fun getForwardsText(context: Context, message: VkMessage): String? {
         if (message.forwards.isNullOrEmpty()) return null
 
         return message.forwards?.let { forwards ->
@@ -523,7 +523,7 @@ object VkUtils {
         }
     }
 
-    fun getAttachmentConversationText(context: Context, message: VkMessage): String? {
+    fun getAttachmentText(context: Context, message: VkMessage): String? {
         message.geoType?.let {
             return when (it) {
                 "point" -> context.getString(R.string.message_geo_point)
diff --git a/app/src/main/kotlin/com/meloda/fast/screens/conversations/ConversationsAdapter.kt b/app/src/main/kotlin/com/meloda/fast/screens/conversations/ConversationsAdapter.kt
index ff80af05..9329923a 100644
--- a/app/src/main/kotlin/com/meloda/fast/screens/conversations/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/conversations/ConversationsAdapter.kt
@@ -153,12 +153,12 @@ class ConversationsAdapter constructor(
             binding.textAttachment.isVisible = attachmentIcon != null
             binding.textAttachment.setImageDrawable(attachmentIcon)
 
-            val attachmentText = if (attachmentIcon == null) VkUtils.getAttachmentConversationText(
+            val attachmentText = if (attachmentIcon == null) VkUtils.getAttachmentText(
                 context = context,
                 message = message
             ) else null
 
-            val forwardsMessage = if (message.text == null) VkUtils.getForwardsConversationText(
+            val forwardsMessage = if (message.text == null) VkUtils.getForwardsText(
                 context = context,
                 message = message
             ) else null
@@ -168,7 +168,7 @@ class ConversationsAdapter constructor(
                 forwardsMessage != null ||
                 attachmentText != null
             ) ""
-            else message.text ?: "[no_message]").run { VkUtils.prepareMessageText(this) }
+            else message.text ?: "").run { VkUtils.prepareMessageText(this) }
 
             val coloredMessage = actionMessage ?: attachmentText ?: forwardsMessage ?: ""
 
diff --git a/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesHistoryFragment.kt b/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesHistoryFragment.kt
index 3b8a10ee..eea80a77 100644
--- a/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesHistoryFragment.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/messages/MessagesHistoryFragment.kt
@@ -618,8 +618,21 @@ class MessagesHistoryFragment :
                 else -> null
             }
 
+            val attachmentText = if (message.text == null) VkUtils.getAttachmentText(
+                context = requireContext(),
+                message = message
+            ) else null
+
+            val forwardsMessage = if (message.text == null) VkUtils.getForwardsText(
+                context = requireContext(),
+                message = message
+            ) else null
+
+            val messageText = forwardsMessage ?: attachmentText
+            ?: (message.text ?: "").run { VkUtils.prepareMessageText(this) }
+
             binding.replyMessageTitle.text = title
-            binding.replyMessageText.text = message.text
+            binding.replyMessageText.text = messageText
 
             if (isEditing) {
                 binding.message.setText(message.text)