diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index 9bfc98ae5f..4766bde394 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/radial_animation.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/fireworks_animation.h"
+#include "ui/toast/toast.h"
 #include "data/data_media_types.h"
 #include "data/data_poll.h"
 #include "data/data_user.h"
@@ -28,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "styles/style_history.h"
 #include "styles/style_widgets.h"
+#include "styles/style_window.h"
 
 namespace HistoryView {
 namespace {
@@ -116,6 +118,13 @@ void CountNicePercent(
 	}
 }
 
+[[nodiscard]] crl::time CountToastDuration(const TextWithEntities &text) {
+	return std::clamp(
+		crl::time(1000) * text.text.size() / 14,
+		crl::time(1000) * 5,
+		crl::time(1000) * 8);
+}
+
 } // namespace
 
 struct Poll::AnswerAnimation {
@@ -405,9 +414,23 @@ void Poll::checkQuizAnswered() {
 			1.,
 			kRollDuration,
 			anim::linear);
+		showSolution();
 	}
 }
 
+void Poll::showSolution() {
+	if (_poll->solution.text.isEmpty()) {
+		return;
+	}
+	auto config = Ui::Toast::Config();
+	config.multiline = true;
+	config.minWidth = st::msgMinWidth;
+	config.maxWidth = st::windowMinWidth;
+	config.text = _poll->solution;
+	config.durationMs = CountToastDuration(config.text);
+	Ui::Toast::Show(config);
+}
+
 void Poll::updateRecentVoters() {
 	auto &&sliced = ranges::view::all(
 		_poll->recentVoters
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.h b/Telegram/SourceFiles/history/view/media/history_view_poll.h
index b689fa96a2..360c9cd950 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.h
@@ -155,6 +155,7 @@ private:
 	void sendMultiOptions();
 	void showResults();
 	void checkQuizAnswered();
+	void showSolution();
 
 	[[nodiscard]] int bottomButtonHeight() const;