diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 9bd066e298..6763776dcd 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2075,7 +2075,7 @@ HistoryMessageReply *Message::displayedReply() const {
 }
 
 bool Message::displayPinIcon() const {
-	return data()->isPinned() && context() != Context::Pinned;
+	return data()->isPinned() && !isPinnedContext();
 }
 
 bool Message::hasFromName() const {
@@ -2250,7 +2250,7 @@ bool Message::displayFastShare() const {
 }
 
 bool Message::displayGoToOriginal() const {
-	if (context() == Context::Pinned) {
+	if (isPinnedContext()) {
 		return !hasOutLayout();
 	}
 	const auto item = message();
@@ -2305,16 +2305,17 @@ void Message::drawRightAction(
 				views->repliesSmall.text,
 				views->repliesSmall.textWidth);
 		}
-	} else if (displayFastShare()) {
-		st::historyFastShareIcon.paintInCenter(p, { left, top, size->width(), size->height() });
 	} else {
-		st::historyGoToOriginalIcon.paintInCenter(p, { left, top, size->width(), size->height() });
+		const auto &icon = (displayFastShare() && !isPinnedContext())
+			? st::historyFastShareIcon
+			: st::historyGoToOriginalIcon;
+		icon.paintInCenter(p, { left, top, size->width(), size->height() });
 	}
 }
 
 ClickHandlerPtr Message::rightActionLink() const {
 	if (!_rightActionLink) {
-		if (context() == Context::Pinned) {
+		if (isPinnedContext()) {
 			_rightActionLink = goToMessageClickHandler(data());
 			return _rightActionLink;
 		} else if (displayRightActionComments()) {
@@ -2390,6 +2391,10 @@ ClickHandlerPtr Message::fastReplyLink() const {
 	return _fastReplyLink;
 }
 
+bool Message::isPinnedContext() const {
+	return context() == Context::Pinned;
+}
+
 void Message::updateMediaInBubbleState() {
 	const auto item = message();
 	const auto media = this->media();
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index e8a3fb2295..d07f8a0763 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -176,6 +176,8 @@ private:
 	QSize performCountCurrentSize(int newWidth) override;
 	bool hasVisibleText() const override;
 
+	[[nodiscard]] bool isPinnedContext() const;
+
 	[[nodiscard]] bool displayFastShare() const;
 	[[nodiscard]] bool displayGoToOriginal() const;
 	[[nodiscard]] ClickHandlerPtr fastReplyLink() const;