diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
index 7f7a8712..27752d44 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/MessageIDMessage.java
@@ -9,14 +9,14 @@ package org.dna.mqtt.moquette.proto.messages;
  * @author andrea
  */
 public abstract class MessageIDMessage extends AbstractMessage {
-    int m_messageID;
+    private Integer m_messageID; //could be null if Qos is == 0
 
-    public int getMessageID() {
+    public Integer getMessageID() {
         return m_messageID;
     }
 
-    public void setMessageID(int messageID) {
+    public void setMessageID(Integer messageID) {
         this.m_messageID = messageID;
     }
-    
+
 }
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
index c8b33555..41742e2a 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/proto/messages/PublishMessage.java
@@ -4,19 +4,19 @@ package org.dna.mqtt.moquette.proto.messages;
  *
  * @author andrea
  */
-public class PublishMessage extends AbstractMessage {
+public class PublishMessage extends MessageIDMessage {
 
     private String m_topicName;
-    private Integer m_messageID; //could be null if Qos is == 0
+//    private Integer m_messageID; //could be null if Qos is == 0
     private byte[] m_payload;
 
-    public Integer getMessageID() {
+    /*public Integer getMessageID() {
         return m_messageID;
     }
 
     public void setMessageID(Integer messageID) {
         this.m_messageID = messageID;
-    }
+    }*/
 
     public String getTopicName() {
         return m_topicName;