From 060cdfea869cca0a95f865213926a4b780035c56 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 11 Mar 2018 23:41:43 +0300
Subject: [PATCH] Cancel reply when setting a forwarding draft.

---
 Telegram/SourceFiles/mainwidget.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 28acafb53..ebf54fecc 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -624,10 +624,8 @@ bool MainWidget::setForwardDraft(PeerId peerId, MessageIdsList &&items) {
 	}
 
 	App::history(peer)->setForwardDraft(std::move(items));
-	if (_history->peer() == peer) {
-		_history->cancelReply();
-	}
 	Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
+	_history->cancelReply();
 	return true;
 }