diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 8daef78bd..43a4ca25d 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -1486,11 +1486,11 @@ export default memo(withGlobal<OwnProps>(
       ? selectChatMessage(global, replyToPeerId || chatId, replyToMsgId)
       : undefined;
     const forwardHeader = forwardInfo || replyFrom;
-    const replyMessageSender = replyMessage ? selectReplySender(global, replyMessage) : forwardHeader
+    const replyMessageSender = replyMessage ? selectReplySender(global, replyMessage) : forwardHeader && !isRepliesChat
       ? selectSenderFromHeader(global, forwardHeader) : undefined;
     const replyMessageForwardSender = replyMessage && selectForwardedSender(global, replyMessage);
     const replyMessageChat = replyToPeerId ? selectChat(global, replyToPeerId) : undefined;
-    const isReplyPrivate = replyMessageChat && !isChatPublic(replyMessageChat)
+    const isReplyPrivate = !isRepliesChat && replyMessageChat && !isChatPublic(replyMessageChat)
       && (replyMessageChat.isNotJoined || replyMessageChat.isRestricted);
     const isReplyToTopicStart = replyMessage?.content.action?.type === 'topicCreate';
     const replyStory = storyReplyId && storyReplyUserId
diff --git a/src/components/middle/message/hooks/useInnerHandlers.ts b/src/components/middle/message/hooks/useInnerHandlers.ts
index b7dd99a85..cfe3f2736 100644
--- a/src/components/middle/message/hooks/useInnerHandlers.ts
+++ b/src/components/middle/message/hooks/useInnerHandlers.ts
@@ -85,7 +85,7 @@ export default function useInnerHandlers(
 
     focusMessage({
       chatId: replyToPeerId || chatId,
-      threadId,
+      threadId: replyToTopId || threadId,
       messageId: replyToMsgId,
       replyMessageId: replyToPeerId ? undefined : messageId,
       noForumTopicPanel: !replyToPeerId ? true : undefined, // Open topic panel for cross-chat replies