diff --git a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
index 89b64c55f..786d9f7f4 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
@@ -71,7 +71,8 @@ class MessageUtils(val context: Context) {
         } else if (message.renderMarkdown == false) {
             SpannableString(message.message)
         } else {
-            enrichChatMessageText(context, message.message!!, incoming, viewThemeUtils)
+            val newMessage = message.message!!.replace("\n", "  \n", false)
+            enrichChatMessageText(context, newMessage, incoming, viewThemeUtils)
         }
     }
 
@@ -106,6 +107,7 @@ class MessageUtils(val context: Context) {
         return processedMessageText
     }
 
+    @Suppress("NestedBlockDepth", "LongParameterList")
     private fun processMessageParameters(
         themingContext: Context,
         viewThemeUtils: ViewThemeUtils,