From f3db5d10977fb0da0fe2b75f1372143b28c4637a Mon Sep 17 00:00:00 2001
From: RadRussianRus <radrussianrus@gmail.com>
Date: Wed, 31 Mar 2021 23:46:52 +0300
Subject: [PATCH] Fix unwanted grouping of media

---
 Telegram/SourceFiles/apiwrap.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index b68b32bf1..6c4c06327 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3820,6 +3820,7 @@ void ApiWrap::forwardMessagesUnquoted(
 			const auto newFrom = item->history()->peer;
 			const auto newGroupId = item->groupId();
 			return forwardFrom != newFrom
+					|| !currentGroupId
 					|| currentGroupId != newGroupId
 					|| lastGroupCheck;
 		} else if (cForwardGrouped()) {