diff --git a/sat/core/xmpp.py b/sat/core/xmpp.py
index 2af23135..b571f1d6 100644
--- a/sat/core/xmpp.py
+++ b/sat/core/xmpp.py
@@ -867,6 +867,10 @@ class SatMessageProtocol(xmppim.MessageProtocol):
                 .format(xml=message_elt.toXml())))
 
         client = self.parent
+
+        if not message_elt.hasAttribute(u'to'):
+            message_elt['to'] = client.jid.full()
+
         message = {}
         subject = {}
         extra = {}