diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Strings.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Strings.kt
new file mode 100644
index 0000000000..09913b9f04
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Strings.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.extensions
+
+/**
+ * Ex: "abcdef".subStringBetween("a", "f") -> "bcde"
+ * Ex: "abcdefff".subStringBetween("a", "f") -> "bcdeff"
+ * Ex: "aaabcdef".subStringBetween("a", "f") -> "aabcde"
+ */
+internal fun String.subStringBetween(prefix: String, suffix: String) = substringAfter(prefix).substringBeforeLast(suffix)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
index 5f0515e669..9a96e78b24 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
@@ -56,6 +56,7 @@ import im.vector.matrix.android.api.session.room.model.relation.ReplyToContent
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent
 import im.vector.matrix.android.internal.di.UserId
+import im.vector.matrix.android.internal.extensions.subStringBetween
 import im.vector.matrix.android.internal.session.content.ThumbnailExtractor
 import im.vector.matrix.android.internal.session.room.send.pills.TextPillsUtils
 import im.vector.matrix.android.internal.task.TaskExecutor
@@ -84,6 +85,7 @@ internal class LocalEchoEventFactory @Inject constructor(
 ) {
     // TODO Inject
     private val parser = Parser.builder().build()
+
     // TODO Inject
     private val renderer = HtmlRenderer.builder().build()
 
@@ -102,8 +104,15 @@ internal class LocalEchoEventFactory @Inject constructor(
             val document = parser.parse(source)
             val htmlText = renderer.render(document)
 
-            if (isFormattedTextPertinent(source, htmlText)) {
-                return TextContent(text.toString(), htmlText)
+            // Cleanup extra paragraph
+            val cleanHtmlText = if (htmlText.startsWith("<p>") && htmlText.endsWith("</p>\n")) {
+                htmlText.subStringBetween("<p>", "</p>\n")
+            } else {
+                htmlText
+            }
+
+            if (isFormattedTextPertinent(source, cleanHtmlText)) {
+                return TextContent(text.toString(), cleanHtmlText)
             }
         } else {
             // Try to detect pills