From c8dd94601b1984df86e3a47b11f4d75498408cea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Jan 2024 15:03:23 +0400
Subject: [PATCH] Don't add original name in forward of reply.

---
 Telegram/SourceFiles/history/view/history_view_reply.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index 1c78094d6..527654d9a 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -430,8 +430,9 @@ void Reply::updateName(
 	const auto originalNameAdded = !displayAsExternal
 		&& forwarded
 		&& !message->isDiscussionPost()
-		&& (!message->showForwardsFromSender(forwarded)
-			|| forwarded->forwardOfForward());
+		&& (forwarded->forwardOfForward()
+			|| (!message->showForwardsFromSender(forwarded)
+				&& !view->data()->Has<HistoryMessageForwarded>()));
 	const auto shorten = !viaBotUsername.isEmpty()
 		|| groupNameAdded
 		|| originalNameAdded;