diff --git a/sat_frontends/quick_frontend/quick_app.py b/sat_frontends/quick_frontend/quick_app.py
index a3db18a9..bfbe4d54 100644
--- a/sat_frontends/quick_frontend/quick_app.py
+++ b/sat_frontends/quick_frontend/quick_app.py
@@ -728,17 +728,11 @@ class QuickApp(object):
         for widget in self.widgets.getWidgets(quick_chat.QuickChat, profiles=(profile,)):
             widget.onMessageState(uid, status, profile)
 
-    def messageSend(
-        self,
-        to_jid,
-        message,
-        subject=None,
-        mess_type="auto",
-        extra=None,
-        callback=None,
-        errback=None,
-        profile_key=C.PROF_KEY_NONE,
-    ):
+    def messageSend(self, to_jid, message, subject=None, mess_type="auto", extra=None, callback=None, errback=None, profile_key=C.PROF_KEY_NONE):
+        if not subject and not extra and (not message or message == {u'': u''}):
+            log.debug(u"Not sending empty message")
+            return
+
         if subject is None:
             subject = {}
         if extra is None:
@@ -753,17 +747,7 @@ class QuickApp(object):
                 failure.fullname, failure.message, "error"
             )
 
-        if not self.trigger.point(
-            "messageSendTrigger",
-            to_jid,
-            message,
-            subject,
-            mess_type,
-            extra,
-            callback,
-            errback,
-            profile_key=profile_key,
-        ):
+        if not self.trigger.point("messageSendTrigger", to_jid, message, subject, mess_type, extra, callback, errback, profile_key=profile_key):
             return
 
         self.bridge.messageSend(