diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
index 17b1127f7a..5872f1cc00 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
@@ -88,7 +88,7 @@ fun MessagesContent(
     hasMoreToLoad: Boolean,
     onReachedLoadMore: () -> Unit,
     onBackPressed: () -> Unit,
-    onSendMessage: (CharSequence) -> Unit,
+    onSendMessage: (String) -> Unit,
     composerFullScreen: Boolean,
     onComposerFullScreenChange: () -> Unit,
     onComposerTextChange: (CharSequence) -> Unit,
diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
index 8543e8d0c0..3e012d1fdc 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt
@@ -60,9 +60,9 @@ class MessagesViewModel(
         }
     }
 
-    fun sendMessage(text: CharSequence) {
+    fun sendMessage(text: String) {
         viewModelScope.launch {
-            timeline.sendMessage(text.toString())
+            timeline.sendMessage(text)
         }
     }
 
diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt
index e4167789c8..0af2f40259 100644
--- a/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt
+++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/timeline/MatrixTimeline.kt
@@ -115,9 +115,13 @@ class MatrixTimeline(
         room.removeTimeline()
     }
 
+    /**
+     * @param message markdown message
+     */
     suspend fun sendMessage(message: String): Result<Unit> {
+        val transactionId = genTransactionId()
         val content = messageEventContentFromMarkdown(message)
-        room.send(content, null)
+        room.send(content, transactionId)
         return Result.success(Unit)
     }
 
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 336a3446d3..0235bc95dd 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
@@ -10,7 +10,7 @@ import io.element.android.x.element.resources.R as ElementR
 
 @Composable
 fun TextComposer(
-    onSendMessage: (CharSequence) -> Unit,
+    onSendMessage: (String) -> Unit,
     modifier: Modifier = Modifier,
     fullscreen: Boolean,
     onFullscreenToggle: () -> Unit,
@@ -36,7 +36,9 @@ fun TextComposer(
                     }
 
                     override fun onSendMessage(text: CharSequence) {
-                        onSendMessage(text)
+                        // 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.
+                        onSendMessage(text.toString())
                     }
 
                     override fun onAddAttachment() {