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;