From bf213cc863fc6a0bb50df0e0a5019aebc65d812d Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Fri, 3 Apr 2020 12:14:08 -0700
Subject: [PATCH 1/2] dont parse emojis until message rendertime

---
 qml/overlays/ChatOverlay.qml | 4 ++--
 qml/widgets/Message.qml      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

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..fbed90f7 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: parse(message, 12, true)
 					textFormat: Text.RichText
 				}
 
 				TextEdit { // this is the actual text display
 					id: lbl
+					text: parse(message, 12, true)
 					color: "#FFFFFF"
 					padding: 6
 					leftPadding: 10

From 481c8ca701a038febad893bc072d3bbcc10cc100 Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Fri, 3 Apr 2020 12:35:10 -0700
Subject: [PATCH 2/2] dont parse emojis until message rendertime

---
 qml/widgets/Message.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qml/widgets/Message.qml b/qml/widgets/Message.qml
index fbed90f7..d59b2fe1 100644
--- a/qml/widgets/Message.qml
+++ b/qml/widgets/Message.qml
@@ -100,7 +100,7 @@ Item {
 					leftPadding: 10
 					font.pixelSize: gcd.themeScale * 12
 					wrapMode: TextEdit.NoWrap
-					text: parse(message, 12, true)
+					text: lbl.text
 					textFormat: Text.RichText
 				}