diff --git a/lot.js b/lot.js
index d5d51261..5464f11e 100644
--- a/lot.js
+++ b/lot.js
@@ -12,7 +12,6 @@ class Lot {
 
   toJson () {
     return {
-      id: this.getId(),
       state: this.getState(),
       text1: this.getText1(),
       text1Meaning: this.getText1Meaning(),
diff --git a/message.js b/message.js
index 9ab2a91b..b9f67188 100644
--- a/message.js
+++ b/message.js
@@ -102,6 +102,7 @@ class Message {
 
   toJson () {
     return {
+      id: this.getId(),
       chatId: this.getChatId(),
       duration: this.getDuration(),
       fromId: this.getFromId(),
@@ -110,6 +111,7 @@ class Message {
       type: binding.dcn_msg_get_type(this.dc_msg),
       state: binding.dcn_msg_get_state(this.dc_msg),
       summary: this.getSummary().toJson(),
+      isSetupmessage: this.isSetupmessage(),
       mediaInfo: this.getMediainfo().toJson(),
       file: this.getFile()
     }