diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 4caec867a..61ed7ca47 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -4301,7 +4301,7 @@ void ApiWrap::forwardMessages( const auto media = item->media(); if (media && !media->webpage()) { - if (media->poll() + if ((media->poll() && !history->peer->isUser()) || media->geoPoint() || media->sharedContact() || media->photo() diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index 6631be98d..42079dde0 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -1535,7 +1535,7 @@ QPointer ShowForwardMessagesBox( const auto media = item->media(); if (media && !media->webpage()) { - if (media->poll() + if ((media->poll() && !history->peer->isUser()) || media->geoPoint() || media->sharedContact() || media->photo()