diff --git a/wai-server/core/handler/whatsappHandler.js b/wai-server/core/handler/whatsappHandler.js
index 57642f1..5184c42 100644
--- a/wai-server/core/handler/whatsappHandler.js
+++ b/wai-server/core/handler/whatsappHandler.js
@@ -219,13 +219,14 @@ const setupMessageHandler = async () => {
       if (savedMsg?.sn) {
         targetUpsert = { sn: savedMsg.sn };
       }
+      const savedMsgKeyFields = pick(savedMsg, ['from', 'to']);
       const bixFields = pick(savedMsg, ['actionId', 'externalId']);
       const savedTimeFields = pick(savedMsg, Object.values(timeField));
       logger.info('message evt\n', eventName, messageData, savedMsg);
       const _type = messageData?.type || savedMsg?.msgtype || 'unresolvable';
       const typeField = { msgtype: _type }; // fix: type 空
 
-      const webhookBody = webhookBodyBuilder({ ...savedTimeFields, ...messageData, ...bixFields, ...typeField }, eventName);
+      const webhookBody = webhookBodyBuilder({ ...savedTimeFields, ...messageData, ...bixFields, ...savedMsgKeyFields, ...typeField }, eventName);
       const { waiMessage } = webhookBody;
 
       const timeFields = pick(waiMessage, Object.values(timeField));