From 3ea799391a04235bfcbdc679dc4bb7c45da082e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 May 2026 11:43:46 +0400
Subject: [PATCH] Fix name overlapping emoji status.

---
 .../SourceFiles/history/view/history_view_message.cpp    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 3f9007e9d6..154c69ccf0 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1855,9 +1855,12 @@ void Message::paintFromName(
 	const auto statusWidth = _fromNameStatus
 		? st::dialogsPremiumIcon.icon.width()
 		: 0;
+	const auto nameAvailableWidth = (statusWidth && availableWidth > statusWidth)
+		? (availableWidth - statusWidth)
+		: availableWidth;
 	if (statusWidth && availableWidth > statusWidth) {
 		const auto x = availableLeft
-			+ std::min(availableWidth - statusWidth, nameText->maxWidth());
+			+ std::min(nameAvailableWidth, nameText->maxWidth());
 		const auto y = trect.top();
 		auto color = nameFg;
 		color.setAlpha(115);
@@ -1897,7 +1900,7 @@ void Message::paintFromName(
 	const auto nameLinkHandler = fromLink();
 	const auto nameWidth = std::min(
 		nameText->maxWidth(),
-		availableWidth);
+		nameAvailableWidth);
 	paintLinkRipple(
 		p,
 		nameLinkHandler,
@@ -1905,7 +1908,7 @@ void Message::paintFromName(
 		trect.topLeft());
 	nameText->draw(p, {
 		.position = { availableLeft, trect.top() },
-		.availableWidth = availableWidth,
+		.availableWidth = nameAvailableWidth,
 		.elisionLines = 1,
 	});
 	const auto skipWidth = nameText->maxWidth()