diff --git a/qml/overlays/ChatOverlay.qml b/qml/overlays/ChatOverlay.qml
index ae36eb5..698a94a 100644
--- a/qml/overlays/ChatOverlay.qml
+++ b/qml/overlays/ChatOverlay.qml
@@ -226,8 +226,11 @@ ColumnLayout {
 				onClicked: {
 					if (txtMessage.text != "") {
 						txtHidden.text = restoreEmoji(txtMessage.text)
-						var msg = JSON.stringify({"o":1, "d":txtHidden.getText(0, txtHidden.text.length)})
-						gcd.sendMessage(msg, nextMessageID++)
+						var txt = txtHidden.getText(0, txtHidden.text.length).trim()
+						if (txt.length > 0) {
+							var msg = JSON.stringify({"o":1, "d":txtHidden.getText(0, txtHidden.text.length)})
+							gcd.sendMessage(msg, nextMessageID++)
+						}
 					}
 					txtMessage.text = ""
 				}
diff --git a/qml/utils.js b/qml/utils.js
index d246f2d..f045284 100644
--- a/qml/utils.js
+++ b/qml/utils.js
@@ -1,11 +1,8 @@
 .pragma library
 
 function htmlEscaped(str) {
-    str = str.replace(/&/g, "&");
     str = str.replace(/</g, "&lt;");
     str = str.replace(/>/g, "&gt;");
-    str = str.replace(/"/g, "&quot;");
-    str = str.replace(/'/g, "&apos;");
     return str
 }
 
diff --git a/qml/widgets/InplaceEditText.qmlc b/qml/widgets/InplaceEditText.qmlc
deleted file mode 100644
index ef3ccb2..0000000
Binary files a/qml/widgets/InplaceEditText.qmlc and /dev/null differ