diff --git a/src/components/chat/messageRender.ts b/src/components/chat/messageRender.ts
index 027cb603..c87ca649 100644
--- a/src/components/chat/messageRender.ts
+++ b/src/components/chat/messageRender.ts
@@ -132,7 +132,7 @@ export namespace MessageRender {
       }).element;
     }
 
-    const wrapped = wrapReply(originalPeerTitle, originalMessage.message || '', originalMessage);
+    const wrapped = wrapReply(originalPeerTitle, undefined, originalMessage);
     if(currentReplyDiv) {
       currentReplyDiv.replaceWith(wrapped);
     } else {
diff --git a/src/components/chat/replyContainer.ts b/src/components/chat/replyContainer.ts
index 91ad1c6a..ea1b8381 100644
--- a/src/components/chat/replyContainer.ts
+++ b/src/components/chat/replyContainer.ts
@@ -95,12 +95,14 @@ export function wrapReplyDivAndCaption(options: {
       }
     }
   } else {
-    if(typeof(subtitle) === 'string') {
+    if(message) {
+      subtitleEl.textContent = '';
+      subtitleEl.append(appMessagesManager.wrapMessageForReply(message, message.message && limitSymbols(message.message, 140)));
+    } else if(typeof(subtitle) === 'string') {
       subtitle = limitSymbols(subtitle, 140);
       subtitle = RichTextProcessor.wrapEmojiText(subtitle);
+      replaceContent(subtitleEl, subtitle);
     }
-
-    replaceContent(subtitleEl, subtitle);
   }
   
   return setMedia;