diff --git a/src/app/chat/views/message_format.nim b/src/app/chat/views/message_format.nim
index 840ba1a142..f9afd09fbf 100644
--- a/src/app/chat/views/message_format.nim
+++ b/src/app/chat/views/message_format.nim
@@ -17,7 +17,7 @@ proc mention(self: ChatMessageList, pubKey: string): string =
 
 # See render-inline in status-react/src/status_im/ui/screens/chat/message/message.cljs
 proc renderInline(self: ChatMessageList, elem: TextItem): string =
-  let value = escape_html(elem.literal).multiReplace(("\r\n", "<br/>")).multiReplace(("\n", "<br/>"))
+  let value = escape_html(elem.literal).multiReplace(("\r\n", "<br/>")).multiReplace(("\n", "<br/>")).multiReplace(("  ", "&nbsp;&nbsp;"))
   case elem.textType:
   of "": result = value
   of "code": result = fmt("<code>{value}</code>")
diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml
index 820e2ea64e..1c04dcd5b9 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn.qml
@@ -335,7 +335,6 @@ StackLayout {
                         chatInput.textInput.textFormat = TextEdit.PlainText;
                         chatInput.textInput.textFormat = TextEdit.RichText;
                     }
-
                 }
             }
         }
diff --git a/ui/shared/status/StatusChatInput.qml b/ui/shared/status/StatusChatInput.qml
index 159d16c998..53073798ec 100644
--- a/ui/shared/status/StatusChatInput.qml
+++ b/ui/shared/status/StatusChatInput.qml
@@ -146,14 +146,14 @@ Rectangle {
         // handle new line in blockquote
         if ((event.key === Qt.Key_Enter || event.key === Qt.Key_Return) && (event.modifiers & Qt.ShiftModifier) && message.data.startsWith(">")) {
             if(message.data.startsWith(">") && !message.data.endsWith("\n\n")) {
-                let newMessage = ""
+                let newMessage1 = ""
                 if (message.data.endsWith("\n> ")) {
-                    newMessage = message.data.substr(0, message.data.lastIndexOf("> ")) + "\n\n"
+                    newMessage1 = message.data.substr(0, message.data.lastIndexOf("> ")) + "\n\n"
                 } else {
-                    newMessage = message.data + "\n> ";
+                    newMessage1 = message.data + "\n> ";
                 }
                 messageInputField.remove(0, messageInputField.cursorPosition);
-                insertInTextInput(0, Emoji.parse(newMessage));
+                insertInTextInput(0, Emoji.parse(newMessage1));
             }
             event.accepted = true
         }
@@ -223,7 +223,7 @@ Rectangle {
         const posBeforeEnd = messageInputField.length - messageInputField.cursorPosition;
         const plainText = getPlainText()
         const formatted = parseBackText(plainText)
-        messageInputField.text = formatted
+        messageInputField.text = formatted.replace(/  /g, '&nbsp;&nbsp;')
         messageInputField.cursorPosition = messageInputField.length - posBeforeEnd;
     }