diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/history_view_compose_controls.h
index 7744882c0..9ed8abfde 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.h
@@ -119,6 +119,7 @@ public:
 
 	[[nodiscard]] TextWithTags getTextWithAppliedMarkdown() const;
 	[[nodiscard]] WebPageId webPageId() const;
+	void setText(const TextWithTags &text);
 	void clear();
 	void hidePanelsAnimated();
 
@@ -138,7 +139,6 @@ private:
 	void toggleTabbedSelectorMode();
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<ChatHelpers::TabbedPanel> panel);
-	void setText(const TextWithTags &text);
 
 	void setTextFromEditingMessage(not_null<HistoryItem*> item);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 1d6287004..acb5ef4df 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1344,7 +1344,7 @@ void Message::drawInfo(
 	}
 
 	if (auto views = item->Get<HistoryMessageViews>()) {
-		const auto showReplies = (views->views < 0) && (views->replies > 0);
+		const auto showReplies = /*(views->views < 0) && */(views->replies > 0);
 		auto icon = [&] {
 			if (item->id > 0) {
 				if (outbg) {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7d907cdf7..2efccb575 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -393,7 +393,7 @@ bool RepliesWidget::confirmSendingFiles(
 		_history->peer->slowmodeApplied() ? SendLimit::One : SendLimit::Many,
 		Api::SendType::Normal,
 		SendMenu::Type::Disabled); // #TODO replies schedule
-	//_field->setTextWithTags({});
+	_composeControls->setText({});
 
 	const auto replyTo = replyToId();
 	box->setConfirmedCallback(crl::guard(this, [=](
@@ -418,19 +418,22 @@ bool RepliesWidget::confirmSendingFiles(
 			replyTo,
 			options,
 			album);
+		if (_composeControls->replyingToMessage().msg == replyTo) {
+			_composeControls->cancelReplyMessage();
+		}
+	}));
+	box->setCancelledCallback(crl::guard(this, [=] {
+		_composeControls->setText(text);
+		//auto cursor = _field->textCursor();
+		//cursor.setPosition(anchor);
+		//if (position != anchor) {
+		//	cursor.setPosition(position, QTextCursor::KeepAnchor);
+		//}
+		//_field->setTextCursor(cursor);
+		//if (!insertTextOnCancel.isEmpty()) {
+		//	_field->textCursor().insertText(insertTextOnCancel);
+		//}
 	}));
-	//box->setCancelledCallback(crl::guard(this, [=] {
-	//	_field->setTextWithTags(text);
-	//	auto cursor = _field->textCursor();
-	//	cursor.setPosition(anchor);
-	//	if (position != anchor) {
-	//		cursor.setPosition(position, QTextCursor::KeepAnchor);
-	//	}
-	//	_field->setTextCursor(cursor);
-	//	if (!insertTextOnCancel.isEmpty()) {
-	//		_field->textCursor().insertText(insertTextOnCancel);
-	//	}
-	//}));
 
 	//ActivateWindow(controller());
 	const auto shown = Ui::show(std::move(box));