diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 2b30e3fbd..ba0488de0 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -521,7 +521,7 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
 			updateAdditionalTitle();
 		});
 	}
-	if (!cForwardQuoted() && _hasMediaMessages) {
+	if (_hasMediaMessages) {
 		_menu->addSeparator();
 		if (!cForwardAlbumsAsIs()) {
 			_menu->addAction(tr::ktg_forward_menu_default_albums(tr::now), [=] {
@@ -531,6 +531,9 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
 		}
 		if (cForwardAlbumsAsIs() || !cForwardGrouped()) {
 			_menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] {
+				if (cForwardQuoted()) {
+					cSetForwardQuoted(false);
+				}
 				cSetForwardAlbumsAsIs(false);
 				cSetForwardGrouped(true);
 				updateAdditionalTitle();
@@ -538,6 +541,9 @@ bool ShareBox::showMenu(not_null<Ui::IconButton*> button) {
 		}
 		if (cForwardAlbumsAsIs() || cForwardGrouped()) {
 			_menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] {
+				if (cForwardQuoted()) {
+					cSetForwardQuoted(false);
+				}
 				cSetForwardAlbumsAsIs(false);
 				cSetForwardGrouped(false);
 				updateAdditionalTitle();
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2f737b4b2..cc985de57 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5307,7 +5307,7 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
 					updateForwardingTexts();
 				});
 			}
-			if (!cForwardQuoted() && hasMediaToGroup && count > 1) {
+			if (hasMediaToGroup && count > 1) {
 				_menu->addSeparator();
 				if (!cForwardAlbumsAsIs()) {
 					_menu->addAction(tr::ktg_forward_menu_default_albums(tr::now), [=] {
@@ -5317,6 +5317,9 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
 				}
 				if (cForwardAlbumsAsIs() || !cForwardGrouped()) {
 					_menu->addAction(tr::ktg_forward_menu_group_all_media(tr::now), [=] {
+						if (cForwardQuoted()) {
+							cSetForwardQuoted(false);
+						}
 						cSetForwardAlbumsAsIs(false);
 						cSetForwardGrouped(true);
 						updateForwardingTexts();
@@ -5324,6 +5327,9 @@ void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
 				}
 				if (cForwardAlbumsAsIs() || cForwardGrouped()) {
 					_menu->addAction(tr::ktg_forward_menu_separate_messages(tr::now), [=] {
+						if (cForwardQuoted()) {
+							cSetForwardQuoted(false);
+						}
 						cSetForwardAlbumsAsIs(false);
 						cSetForwardGrouped(false);
 						updateForwardingTexts();