diff --git a/gajim/common/zeroconf/connection_handlers_zeroconf.py b/gajim/common/zeroconf/connection_handlers_zeroconf.py
index 31059c4b46d3345ba1b2c5c2e4607d52535a6155..3fdbaf5edfa7767b35c2d5b0302fcd4d999eaf04 100644
--- a/gajim/common/zeroconf/connection_handlers_zeroconf.py
+++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py
@@ -64,12 +64,15 @@ class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf,
         connection_handlers.ConnectionJingle.__init__(self)
         connection_handlers.ConnectionHandlersBase.__init__(self)
 
-    def _messageCB(self, _con, stanza, properties):
+    def _messageCB(self, con, stanza, properties):
         """
         Called when we receive a message
         """
         log.info('Zeroconf MessageCB')
 
+        # Dont trust from attr set by sender
+        stanza.setFrom(con._owner.to)
+
         app.nec.push_incoming_event(NetworkEvent(
             'raw-message-received',
             conn=self,
@@ -110,6 +113,7 @@ class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf,
             'jid': jid,
             'resource': resource,
             'unique_id': id_,
+            'message_id': properties.id,
             'mtype': type_,
             'msgtxt': msgtxt,
             'thread_id': thread_id,