diff --git a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
index d0daff533..5309a3827 100644
--- a/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
+++ b/Telegram/SourceFiles/ayu/ui/context_menu/context_menu.cpp
@@ -90,7 +90,7 @@ void AddUserMessagesAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
 												   ? Dialogs::Key{item->topic()}
 												   : Dialogs::Key{item->history()}
 											 : Dialogs::Key();
-						mainWidget->content()->searchMessages(QString(), key, item->from()->asUser());
+						mainWidget->content()->searchMessages(QString(), key, item->from());
 					}
 				}
 			},
@@ -310,7 +310,7 @@ void AddMessageDetailsAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
 }
 
 void AddReadUntilAction(not_null<Ui::PopupMenu*> menu, HistoryItem *item) {
-	if (item->isLocal() || item->isService()) {
+	if (item->isLocal() || item->isService() || item->out()) {
 		return;
 	}
 
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 614d75565..b9261f7d5 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -743,7 +743,7 @@ void MainWidget::hideSingleUseKeyboard(FullMsgId replyToId) {
 	_history->hideSingleUseKeyboard(replyToId);
 }
 
-void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat, UserData *from) {
+void MainWidget::searchMessages(const QString &query, Dialogs::Key inChat, PeerData *from) {
 	auto tags = Data::SearchTagsFromQuery(query);
 	if (_dialogs) {
 		auto state = Dialogs::SearchState{
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index fae9d9897..0b61a85ee 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -163,7 +163,7 @@ public:
 	void sendBotCommand(Bot::SendCommandRequest request);
 	void hideSingleUseKeyboard(FullMsgId replyToId);
 
-	void searchMessages(const QString &query, Dialogs::Key inChat, UserData *from = nullptr);
+	void searchMessages(const QString &query, Dialogs::Key inChat, PeerData *from = nullptr);
 
 	void setChatBackground(
 		const Data::WallPaper &background,