diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 3e4e9cea09..042aab3f4f 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -286,7 +286,7 @@ bool Element::isUnderCursor() const {
 }
 
 bool Element::isLastAndSelfMessage() const {
-	if (!hasOutLayout()) {
+	if (!hasOutLayout() || data()->_history->peer->isSelf()) {
 		return false;
 	}
 	if (const auto last = data()->_history->lastMessage()) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 326d4ae2b9..19dab0ea59 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -1462,7 +1462,8 @@ bool Gif::needInfoDisplay() const {
 	return _parent->data()->isSending()
 		|| _data->uploading()
 		|| _parent->isUnderCursor()
-		|| _parent->isLastAndSelfMessage();
+		// Don't show the GIF badge if this message has text.
+		|| (!_parent->hasBubble() && _parent->isLastAndSelfMessage());
 }
 
 bool Gif::needCornerStatusDisplay() const {