From d3420b6a92220c42dbb4698d1099a6ed1047a414 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 11 Feb 2017 10:55:43 +0300
Subject: [PATCH] Fixed info display in media in non-group chats.

Version 1.0.8 introduced a regression in displaying forwarded,
reply and via @bot information in photo, video, GIFs and locations.
---
 .../SourceFiles/history/history_media_types.h | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_media_types.h b/Telegram/SourceFiles/history/history_media_types.h
index 2dbf4aff4e..ff8331323b 100644
--- a/Telegram/SourceFiles/history/history_media_types.h
+++ b/Telegram/SourceFiles/history/history_media_types.h
@@ -162,7 +162,10 @@ public:
 			return true;
 		}
 		if (auto message = _parent->toHistoryMessage()) {
-			return message->displayFromName();
+			return message->viaBot()
+				|| message->Has<HistoryMessageForwarded>()
+				|| message->Has<HistoryMessageReply>()
+				|| message->displayFromName();
 		}
 		return false;
 	}
@@ -249,7 +252,10 @@ public:
 			return true;
 		}
 		if (auto message = _parent->toHistoryMessage()) {
-			return message->displayFromName();
+			return message->viaBot()
+				|| message->Has<HistoryMessageForwarded>()
+				|| message->Has<HistoryMessageReply>()
+				|| message->displayFromName();
 		}
 		return false;
 	}
@@ -503,7 +509,10 @@ public:
 			return true;
 		}
 		if (auto message = _parent->toHistoryMessage()) {
-			return message->displayFromName();
+			return message->viaBot()
+				|| message->Has<HistoryMessageForwarded>()
+				|| message->Has<HistoryMessageReply>()
+				|| message->displayFromName();
 		}
 		return false;
 	}
@@ -904,7 +913,10 @@ public:
 			return true;
 		}
 		if (auto message = _parent->toHistoryMessage()) {
-			return message->displayFromName();
+			return message->viaBot()
+				|| message->Has<HistoryMessageForwarded>()
+				|| message->Has<HistoryMessageReply>()
+				|| message->displayFromName();
 		}
 		return false;
 	}