diff --git a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt
index 4906edd365..8d08e1fa11 100644
--- a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt
+++ b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt
@@ -213,7 +213,7 @@ class RichTextComposerLayout @JvmOverloads constructor(
         }
 
         views.sendButton.setOnClickListener {
-            val textMessage = text?.toSpannable() ?: ""
+            val textMessage = views.richTextComposerEditText.getMarkdown() // text?.toSpannable() ?: ""
             callback?.onSendMessage(textMessage)
         }
 
diff --git a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt
index fe616a085e..9e4f3c24c3 100644
--- a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt
@@ -39,8 +39,7 @@ fun TextComposer(
                     }
 
                     override fun onSendMessage(text: CharSequence) {
-                        // TODO The Wysiwyg team is working to be able to get a markdown version of the text
-                        // For now we send only the plain text. `formattedText` is Html.
+                        // text contains markdown.
                         onSendMessage(text.toString())
                     }