diff --git a/src/util/Injected.js b/src/util/Injected.js
index dabc6ea..a559a43 100644
--- a/src/util/Injected.js
+++ b/src/util/Injected.js
@@ -205,7 +205,9 @@ exports.LoadUtils = () => {
     window.WWebJS.getMessageModel = message => {
         const msg = message.serialize();
         msg.isStatusV3 = message.isStatusV3;
-
+        if (msg.buttons) {
+            msg.buttons = msg.buttons.serialize();
+        }
         delete msg.pendingAckUpdate;
         return msg;
     };
@@ -221,6 +223,8 @@ exports.LoadUtils = () => {
             res.groupMetadata = chat.groupMetadata.serialize();
         }
 
+        delete res.msgs;
+
         return res;
     };