From 4e53c4f690d00023175cb3f383a457320b8e9758 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefan.ceriu@gmail.com>
Date: Thu, 4 Jan 2024 14:04:41 +0200
Subject: [PATCH] Fixes #2296 - Set MarkdownContent instead of HTMLContent on
 the rich text editor when feature disabled

---
 .../Screens/ComposerToolbar/ComposerToolbarViewModel.swift | 7 ++++++-
 changelog.d/2296.bugfix                                    | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2296.bugfix

diff --git a/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarViewModel.swift b/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarViewModel.swift
index afef6cd93..49163e52d 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarViewModel.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/ComposerToolbarViewModel.swift
@@ -245,7 +245,12 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
 
     private func set(text: String) {
         wysiwygViewModel.textView.flushPills()
-        wysiwygViewModel.setHtmlContent(text)
+        
+        if appSettings.richTextEditorEnabled {
+            wysiwygViewModel.setHtmlContent(text)
+        } else {
+            wysiwygViewModel.setMarkdownContent(text)
+        }
     }
 
     private func createLinkAlert() {
diff --git a/changelog.d/2296.bugfix b/changelog.d/2296.bugfix
new file mode 100644
index 000000000..1a7c8e408
--- /dev/null
+++ b/changelog.d/2296.bugfix
@@ -0,0 +1 @@
+Trying to edit messages containing links with angle brackets doesn't pre-populate the message composer
\ No newline at end of file