diff --git a/src/app/chat/views/message_format.nim b/src/app/chat/views/message_format.nim
index e508a8279b..759a5e5603 100644
--- a/src/app/chat/views/message_format.nim
+++ b/src/app/chat/views/message_format.nim
@@ -34,6 +34,7 @@ proc renderBlock(self: ChatMessageList, message: Message): string =
       of "blockquote":
         # TODO: extract this from the theme somehow
         var color = if message.isCurrentUser: "#FFFFFF" else: "#666666" 
-        result = result & fmt("<span style=\"color: {color}\">▍ ") & pMsg.literal[1 .. ^1] & "</span>"
+        result = result & fmt("<span style=\"color: {color}\">▍ ") & pMsg.literal & "</span>"
       of "codeblock":
         result = "<table style=\"background-color: #1a356b;\"><tr><td style=\"padding: 5px;\"><code style=\"color: #ffffff\">" & pMsg.literal & "</code></td></tr></table>"
+    result = result.replace("\n", "<br />")
\ No newline at end of file
diff --git a/src/app/chat/views/message_list.nim b/src/app/chat/views/message_list.nim
index 62e4272811..349fcfcab8 100644
--- a/src/app/chat/views/message_list.nim
+++ b/src/app/chat/views/message_list.nim
@@ -5,7 +5,7 @@ import ../../../status/chat
 import ../../../status/chat/[message,stickers]
 import ../../../status/profile/profile
 import ../../../status/ens
-import strformat
+import strformat, strutils
 
 type
   ChatMessageRoles {.pure.} = enum
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
index 4efe316df8..9d784b0f6a 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
@@ -242,7 +242,7 @@ Item {
             anchors.right: message.length > 52 ? parent.right : undefined
             anchors.rightMargin: message.length > 52 ? parent.chatHorizontalPadding : 0
             horizontalAlignment: !isCurrentUser ? Text.AlignLeft : Text.AlignRight
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.Wrap
             anchors.top: parent.top
             anchors.topMargin: chatBox.chatVerticalPadding
             font.pixelSize: 15