diff --git a/app/src/main/kotlin/com/meloda/fast/screens/messages/AttachmentInflater.kt b/app/src/main/kotlin/com/meloda/fast/screens/messages/AttachmentInflater.kt
index b0b7a332..32b983c2 100644
--- a/app/src/main/kotlin/com/meloda/fast/screens/messages/AttachmentInflater.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/messages/AttachmentInflater.kt
@@ -60,7 +60,10 @@ class AttachmentInflater constructor(
         attachments = message.attachments!!
 
         container.removeAllViews()
-        textContainer.removeAllViews()
+
+        if (textContainer.childCount > 1) {
+            textContainer.removeViews(1, textContainer.childCount - 1)
+        }
 
         if (attachments.size == 1) {
             when (val attachment = attachments[0]) {
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 b4242f11..3b8a10ee 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
@@ -619,10 +619,10 @@ class MessagesHistoryFragment :
             }
 
             binding.replyMessageTitle.text = title
-            binding.replyMessageText.text = message.text ?: "[no_message]"
+            binding.replyMessageText.text = message.text
 
             if (isEditing) {
-                binding.message.setText(message.text ?: "[no_message]")
+                binding.message.setText(message.text)
             }
         }