diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index acc6544f3a..500d09bb65 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -526,10 +526,10 @@ void Message::paintFromName(
 		if (item->isPost()) {
 			p.setPen(selected ? st::msgInServiceFgSelected : st::msgInServiceFg);
 		} else {
-			p.setPen(FromNameFg(item->author(), selected));
+			p.setPen(FromNameFg(item->displayFrom(), selected));
 		}
 		item->displayFrom()->nameText.drawElided(p, availableLeft, trect.top(), availableWidth);
-		auto skipWidth = item->author()->nameText.maxWidth() + st::msgServiceFont->spacew;
+		auto skipWidth = item->displayFrom()->nameText.maxWidth() + st::msgServiceFont->spacew;
 		availableLeft += skipWidth;
 		availableWidth -= skipWidth;
 
@@ -861,7 +861,7 @@ bool Message::getStateFromName(
 			auto via = item->Get<HistoryMessageVia>();
 			if (via
 				&& !displayForwardedFrom()
-				&& point.x() >= availableLeft + item->author()->nameText.maxWidth() + st::msgServiceFont->spacew
+				&& point.x() >= availableLeft + item->displayFrom()->nameText.maxWidth() + st::msgServiceFont->spacew
 				&& point.x() < availableLeft + availableWidth
 				&& point.x() < availableLeft + user->nameText.maxWidth() + st::msgServiceFont->spacew + via->width) {
 				outResult->link = via->link;
@@ -1514,7 +1514,7 @@ void Message::fromNameUpdated(int width) const {
 			via->resize(width
 				- st::msgPadding.left()
 				- st::msgPadding.right()
-				- item->author()->nameText.maxWidth()
+				- item->displayFrom()->nameText.maxWidth()
 				- st::msgServiceFont->spacew);
 		}
 	}