From 959f9dfc26307b2e8cddb30c67a66ef984f3f43e Mon Sep 17 00:00:00 2001
From: luvletter2333 <luvletter2333@gmail.com>
Date: Mon, 28 Feb 2022 14:08:05 +0800
Subject: [PATCH] fix fwd in Replies

---
 .../src/main/java/org/telegram/messenger/MessageObject.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
index a35dc058e..5b6e6cb84 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
@@ -5825,8 +5825,9 @@ public class MessageObject {
                 && (
                 messageOwner.fwd_from.saved_from_peer == null
                         || messageOwner.fwd_from.from_id instanceof TLRPC.TL_peerChannel && messageOwner.fwd_from.saved_from_peer.channel_id != messageOwner.fwd_from.from_id.channel_id
-                        || messageOwner.fwd_from.from_id instanceof TLRPC.TL_peerUser
-                        || messageOwner.fwd_from.from_id == null && messageOwner.fwd_from.from_name != null
+                        || (((messageOwner.flags & TLRPC.MESSAGE_FLAG_REPLY) == 0) &&
+                        (messageOwner.fwd_from.from_id instanceof TLRPC.TL_peerUser
+                                || messageOwner.fwd_from.from_id == null && messageOwner.fwd_from.from_name != null))
         )
                 && UserConfig.getInstance(currentAccount).getClientUserId() != getDialogId();
     }