diff --git a/qml/main.qml b/qml/main.qml
index d7513e4..651703d 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -9,6 +9,7 @@ import "fonts/Twemoji.js" as T
 import "overlays"
 import "panes"
 import "widgets"
+import "utils.js" as Utils
 
 Item {
 	id: windowItem
@@ -27,7 +28,7 @@ Item {
 		T.twemoji.ext = ".png"
 		T.twemoji.size = "72x72"
 		T.twemoji.className = "\" height=\""+size+"\" width=\""+size
-		return T.twemoji.parse(text)
+		return T.twemoji.parse(Utils.htmlEscaped(text))
 	}
 
 	function restoreEmoji(text) { // REPLACE <IMG> TAGS WITH EMOJI
diff --git a/qml/overlays/ChatOverlay.qml b/qml/overlays/ChatOverlay.qml
index 02e3dfc..ba617c7 100644
--- a/qml/overlays/ChatOverlay.qml
+++ b/qml/overlays/ChatOverlay.qml
@@ -7,6 +7,7 @@ import QtQuick.Layouts 1.3
 import "../widgets"
 import "../widgets/controls" as Awesome
 import "../fonts/Twemoji.js" as T
+import "../utils.js" as Utils
 
 ColumnLayout {
 	Layout.fillWidth: true
@@ -46,7 +47,7 @@ ColumnLayout {
 					"_handle": handle,
 					"_from": from,
 					"_displayName": displayName,
-					"_message": parse(msg.d, 12),
+					"_message":parse(msg.d, 12),
 					"_image": image,
 					"_mid": mid,
 					"_fromMe": fromMe,
diff --git a/qml/utils.js b/qml/utils.js
new file mode 100644
index 0000000..e3918ff
--- /dev/null
+++ b/qml/utils.js
@@ -0,0 +1,10 @@
+.pragma library
+
+function htmlEscaped(str) {
+    str = str.replace(/&/g, "&amp;");
+    str = str.replace(/</g, "&lt;");
+    str = str.replace(/>/g, "&gt;");
+    str = str.replace(/"/g, "&quot;");
+    str = str.replace(/'/g, "&apos;");
+    return str
+}