diff --git a/src/app/chat/views/message_format.nim b/src/app/chat/views/message_format.nim
index 92dedd0198..840ba1a142 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(("\n", "<br/>"))
+  let value = escape_html(elem.literal).multiReplace(("\r\n", "<br/>")).multiReplace(("\n", "<br/>"))
   case elem.textType:
   of "": result = value
   of "code": result = fmt("<code>{value}</code>")