diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 4f1ca68872..e548fdfaaf 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -213,6 +213,7 @@ void SendExistingMedia(
 	auto flags = NewMessageFlags(peer);
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (welcomeTemplate) {
+		flags &= ~MessageFlag::Outgoing;
 		flags |= MessageFlag::FakeHistoryItem;
 	}
 	if (action.replyTo) {
@@ -662,6 +663,7 @@ void SendConfirmedFile(
 
 	auto flags = isEditing ? MessageFlags() : NewMessageFlags(peer);
 	if (welcomeTemplate) {
+		flags &= ~MessageFlag::Outgoing;
 		flags |= MessageFlag::FakeHistoryItem;
 	}
 	if (file->to.replyTo) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 5877961768..3bce9c64a9 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1764,8 +1764,8 @@ void Controller::fillManageSection() {
 		auto count = rpl::single(rpl::empty) | rpl::then(
 			store->updates(history)
 		) | rpl::map([=] {
-			return QString::number(store->count(history));
-		});
+			return store->count(history);
+		}) | ToPositiveNumberString();
 		auto callback = [=] {
 			_navigation->showSection(
 				std::make_shared<HistoryView::WelcomeMessagesMemento>(