diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
index 7e43a5c09..4ca6a4628 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
@@ -6871,17 +6871,9 @@ public class MessageObject {
     }
 
     public boolean needDrawForwarded() {
-        return (messageOwner.flags & TLRPC.MESSAGE_FLAG_FWD) != 0
-                && messageOwner.fwd_from != null
-                && !messageOwner.fwd_from.imported
-                && (
-                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.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();
+        return (messageOwner.flags & TLRPC.MESSAGE_FLAG_FWD) != 0 && messageOwner.fwd_from != null && !messageOwner.fwd_from.imported && (
+                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
+        ) && UserConfig.getInstance(currentAccount).getClientUserId() != getDialogId() && !UserObject.isReplyUser(messageOwner.dialog_id);
     }
 
     public static boolean isForwardedMessage(TLRPC.Message message) {