diff --git a/Telegram/SourceFiles/history/history_media.h b/Telegram/SourceFiles/history/history_media.h
index df46d44dd..19238d8c4 100644
--- a/Telegram/SourceFiles/history/history_media.h
+++ b/Telegram/SourceFiles/history/history_media.h
@@ -145,9 +145,6 @@ public:
 	virtual QMargins bubbleMargins() const {
 		return QMargins();
 	}
-	virtual bool hideFromName() const {
-		return false;
-	}
 	virtual bool hideForwardedFrom() const {
 		return false;
 	}
diff --git a/Telegram/SourceFiles/history/history_media_types.h b/Telegram/SourceFiles/history/history_media_types.h
index fb14f022b..8b5a2fbaa 100644
--- a/Telegram/SourceFiles/history/history_media_types.h
+++ b/Telegram/SourceFiles/history/history_media_types.h
@@ -161,17 +161,14 @@ public:
 		if (!_caption.isEmpty()) {
 			return true;
 		}
-		if (_parent->viaBot()) {
-			return true;
+		if (auto message = _parent->toHistoryMessage()) {
+			return message->displayFromName();
 		}
-		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
+		return false;
 	}
 	bool customInfoLayout() const override {
 		return _caption.isEmpty();
 	}
-	bool hideFromName() const override {
-		return true;
-	}
 	bool skipBubbleTail() const override {
 		return isBubbleBottom() && _caption.isEmpty();
 	}
@@ -251,17 +248,14 @@ public:
 		if (!_caption.isEmpty()) {
 			return true;
 		}
-		if (_parent->viaBot()) {
-			return true;
+		if (auto message = _parent->toHistoryMessage()) {
+			return message->displayFromName();
 		}
-		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
+		return false;
 	}
 	bool customInfoLayout() const override {
 		return _caption.isEmpty();
 	}
-	bool hideFromName() const override {
-		return true;
-	}
 	bool skipBubbleTail() const override {
 		return isBubbleBottom() && _caption.isEmpty();
 	}
@@ -480,17 +474,14 @@ public:
 		if (!_caption.isEmpty()) {
 			return true;
 		}
-		if (_parent->viaBot()) {
-			return true;
+		if (auto message = _parent->toHistoryMessage()) {
+			return message->displayFromName();
 		}
-		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
+		return false;
 	}
 	bool customInfoLayout() const override {
 		return _caption.isEmpty();
 	}
-	bool hideFromName() const override {
-		return true;
-	}
 	bool skipBubbleTail() const override {
 		return isBubbleBottom() && _caption.isEmpty();
 	}
@@ -884,10 +875,10 @@ public:
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			return true;
 		}
-		if (_parent->viaBot()) {
-			return true;
+		if (auto message = _parent->toHistoryMessage()) {
+			return message->displayFromName();
 		}
-		return (_parent->Has<HistoryMessageForwarded>() || _parent->Has<HistoryMessageReply>());
+		return false;
 	}
 	bool customInfoLayout() const override {
 		return true;
diff --git a/Telegram/SourceFiles/history/history_message.h b/Telegram/SourceFiles/history/history_message.h
index 714ff367e..1918b7a22 100644
--- a/Telegram/SourceFiles/history/history_message.h
+++ b/Telegram/SourceFiles/history/history_message.h
@@ -60,8 +60,7 @@ public:
 	bool displayFromName() const {
 		if (!hasFromName()) return false;
 		if (isAttachedToPrevious()) return false;
-
-		return (!emptyText() || !_media || !_media->isDisplayed() || Has<HistoryMessageReply>() || Has<HistoryMessageForwarded>() || viaBot() || !_media->hideFromName());
+		return true;
 	}
 	bool displayEditedBadge(bool hasViaBotOrInlineMarkup) const;
 	bool uploading() const {