diff --git a/Telegram/SourceFiles/chat_helpers/compose/compose_features.h b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
index 67f816290a..d80d99e298 100644
--- a/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
+++ b/Telegram/SourceFiles/chat_helpers/compose/compose_features.h
@@ -31,6 +31,7 @@ struct ComposeFeatures {
 	bool editMessageStars : 1 = false;
 	bool emojiOnlyPanel : 1 = false;
 	bool videoStream : 1 = false;
+	bool richEditor : 1 = true;
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index e9c005d7b0..ea3c40b30c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1384,6 +1384,14 @@ void ComposeControls::updateFeatures(ChatHelpers::ComposeFeatures features) {
 	if (was.emojiOnlyPanel != features.emojiOnlyPanel) {
 		initFieldAutocomplete();
 	}
+	if (was.richEditor != features.richEditor) {
+		untrackThreadFieldVisibility();
+		unregisterDraftSources();
+		trackThreadFieldVisibility();
+		registerDraftSource();
+		updateExpandButtonVisibility();
+		changed = true;
+	}
 	if (changed) {
 		updateControlsGeometry(_wrap->size());
 	}
@@ -2119,7 +2127,8 @@ bool ComposeControls::isComposeBoxOpen() const {
 }
 
 bool ComposeControls::hasRichDraftThreadScope() const {
-	return draftKey(DraftType::Normal).isLocal();
+	return _features.richEditor
+		&& draftKey(DraftType::Normal).isLocal();
 }
 
 bool ComposeControls::hasEditDraft() const {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
index c1fae9a2ee..fe879abbd3 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp
@@ -130,6 +130,7 @@ namespace {
 		.recordMediaMessage = !videoStream,
 		.editMessageStars = videoStream,
 		.emojiOnlyPanel = videoStream,
+		.richEditor = false,
 	};
 }