diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 2c1e361fb..3395a5850 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -760,7 +760,7 @@ int PeerListRow::paintNameIconGetWidth(
 		nameWidth,
 		outerWidth,
 		{
-			.peer = _peer,
+			.peer = peer(),
 			.verified = &(selected
 				? st::dialogsVerifiedIconOver
 				: st::dialogsVerifiedIcon),
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
index c90ee395c..baa569ab3 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_statistics.h"
 #include "apiwrap.h"
+#include "base/event_filter.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "history/history_item.h"
@@ -28,9 +29,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rect.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_boxes.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 #include "styles/style_statistics.h"
 
@@ -43,6 +46,39 @@ struct Descriptor final {
 	not_null<QWidget*> toastParent;
 };
 
+void AddContextMenu(
+		not_null<Ui::RpWidget*> button,
+		not_null<Controller*> controller,
+		not_null<HistoryItem*> item) {
+	const auto fullId = item->fullId();
+	const auto contextMenu = button->lifetime()
+		.make_state<base::unique_qptr<Ui::PopupMenu>>();
+	const auto showMenu = [=] {
+		*contextMenu = base::make_unique_q<Ui::PopupMenu>(
+			button,
+			st::popupMenuWithIcons);
+		const auto go = [=] {
+			const auto &session = controller->parentController();
+			if (const auto item = session->session().data().message(fullId)) {
+				session->showMessage(item);
+			}
+		};
+		contextMenu->get()->addAction(
+			tr::lng_context_to_msg(tr::now),
+			crl::guard(controller, go),
+			&st::menuIconShowInChat);
+		contextMenu->get()->popup(QCursor::pos());
+	};
+
+	base::install_event_filter(button, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::ContextMenu) {
+			showMenu();
+			return base::EventFilterResult::Cancel;
+		}
+		return base::EventFilterResult::Continue;
+	});
+}
+
 void ProcessZoom(
 		const Descriptor &d,
 		not_null<Statistic::ChartWidget*> widget,
@@ -544,7 +580,9 @@ void InnerWidget::fill() {
 	if (_state.stats.message) {
 		if (const auto i = _peer->owner().message(_contextId)) {
 			::Settings::AddSkip(inner);
-			inner->add(object_ptr<MessagePreview>(this, i, -1, -1, QImage()));
+			const auto preview = inner->add(
+				object_ptr<MessagePreview>(this, i, -1, -1, QImage()));
+			AddContextMenu(preview, _controller, i);
 			::Settings::AddSkip(inner);
 			::Settings::AddDivider(inner);
 		}
@@ -639,6 +677,8 @@ void InnerWidget::fillRecentPosts() {
 			info.forwardsCount,
 			std::move(cachedPreview));
 
+		AddContextMenu(button, _controller, item);
+
 		_messagePreviews.push_back(raw);
 		raw->show();
 		button->sizeValue(
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 1c10841d0..3d92fb323 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -549,7 +549,7 @@ void SetupSystemIntegrationContent(
 	}, warnBeforeQuit->lifetime());
 
 #ifndef OS_MAC_STORE
-	const auto enabled = [] {
+	const auto enabled = [=] {
 		const auto digest = base::Platform::CurrentCustomAppIconDigest();
 		return digest && (settings->macRoundIconDigest() == digest);
 	};