diff --git a/python-agent/muranoagent/common/messaging/message.py b/python-agent/muranoagent/common/messaging/message.py
index c6bb83fd..2c98dee9 100644
--- a/python-agent/muranoagent/common/messaging/message.py
+++ b/python-agent/muranoagent/common/messaging/message.py
@@ -25,7 +25,7 @@ class Message(object):
         self._connection = connection
         self._message_handle = message_handle
         if message_handle:
-            self.id = message_handle.headers.get('message_id')
+            self.id = message_handle.properties.get('message_id')
         else:
             self.id = None
 
diff --git a/python-agent/muranoagent/common/messaging/mqclient.py b/python-agent/muranoagent/common/messaging/mqclient.py
index 6a701749..ee6c5654 100644
--- a/python-agent/muranoagent/common/messaging/mqclient.py
+++ b/python-agent/muranoagent/common/messaging/mqclient.py
@@ -91,14 +91,12 @@ class MqClient(object):
         if not self._connected:
             raise RuntimeError('Not connected to RabbitMQ')
 
-        headers = {'message_id': str(message.id)}
-
         producer = kombu.Producer(self._connection)
         producer.publish(
             exchange=str(exchange),
             routing_key=str(key),
             body=anyjson.dumps(message.body),
-            headers=headers
+            message_id=str(message.id)
         )
 
     def open(self, queue, prefetch_count=1):