diff --git a/qml/overlays/ChatOverlay.qml b/qml/overlays/ChatOverlay.qml
index 74796dc3..12dbd680 100644
--- a/qml/overlays/ChatOverlay.qml
+++ b/qml/overlays/ChatOverlay.qml
@@ -66,7 +66,7 @@ Item {
                     "_handle": handle,
                     "_from": from,
                     "_displayName": displayName,
-                    "_message":parse(msg.d, 12, true),
+                    "_message": msg.d,
                     "_rawMessage":msg.d,
                     "_image": image,
                     "_mid": mid,
@@ -99,7 +99,7 @@ Item {
                     "_handle": handle,
                     "_from": from,
                     "_displayName": displayName,
-                    "_message":parse(msg.d, 24, true),
+                    "_message": msg.d,
                     "_rawMessage":msg.d,
                     "_image": image,
                     "_mid": mid,
diff --git a/qml/widgets/Message.qml b/qml/widgets/Message.qml
index 7f437001..d59b2fe1 100644
--- a/qml/widgets/Message.qml
+++ b/qml/widgets/Message.qml
@@ -13,7 +13,7 @@ Item {
 	anchors.right: fromMe ? parent.right : undefined
 	height: Math.max(imgProfile.height, rectMessageBubble.height)
 
-	property alias message: lbl.text
+	property string message
 	property string rawMessage
 	property string from
 	property string handle
@@ -100,12 +100,13 @@ Item {
 					leftPadding: 10
 					font.pixelSize: gcd.themeScale * 12
 					wrapMode: TextEdit.NoWrap
-					text: message
+					text: lbl.text
 					textFormat: Text.RichText
 				}
 
 				TextEdit { // this is the actual text display
 					id: lbl
+					text: parse(message, 12, true)
 					color: "#FFFFFF"
 					padding: 6
 					leftPadding: 10