diff --git a/src/channel/bubbleMsgUtils.js b/src/channel/bubbleMsgUtils.js
index 244fa27..c6d8129 100644
--- a/src/channel/bubbleMsgUtils.js
+++ b/src/channel/bubbleMsgUtils.js
@@ -285,7 +285,7 @@ const whatsappMsgMapped = {
   'whatsapp.inbound_message.received': {
     getMsg: (result) => {
       console.log('whatsapp.inbound_message.received', result);
-      return isEmpty(result?.whatsappInboundMessage) ? null : { ...result.whatsappInboundMessage, conversationid: result.conversationid, messageorigin: result.messageorigin };
+      return isEmpty(result?.whatsappInboundMessage) ? null : { ...result.whatsappInboundMessage, conversationid: result.conversationid, messageorigin: result.messageorigin, msg_source: 'WABA', msg_direction: 'inbound' };
     },
     contentToRender: (contentObj) => {
       console.log('whatsapp.inbound_message.received to render', contentObj);
@@ -296,7 +296,7 @@ const whatsappMsgMapped = {
   'whatsapp.message.updated': {
     getMsg: (result) => {
       // console.log('getMsg', result);
-      return isEmpty(result?.whatsappMessage) ? null : { ...result.whatsappMessage, conversationid: result.conversationid, messageorigin: result.messageorigin };
+      return isEmpty(result?.whatsappMessage) ? null : { ...result.whatsappMessage, conversationid: result.conversationid, messageorigin: result.messageorigin, msg_source: 'WABA', msg_direction: 'outbound' };
     },
     contentToRender: (contentObj) => {
       if (contentObj?.status === 'failed' && ['130472', 'BAD_REQUEST'].includes(contentObj.errorCode)) {
@@ -327,7 +327,7 @@ const emailMsgMapped = {
     getMsg: (result) => {
       console.log('email.inbound.received', result);
       const data1 = pick(result, ['conversationid', 'opi_sn', 'coli_sn', 'coli_id']);
-      return isEmpty(result?.emailMessage) ? null : { ...result.emailMessage, ...data1,  };
+      return isEmpty(result?.emailMessage) ? null : { ...result.emailMessage, ...data1, msg_source: 'email', msg_direction: 'inbound' };
     },
     contentToRender: (contentObj) => {
       // console.log('email.inbound.received to render', contentObj);
@@ -340,7 +340,7 @@ const emailMsgMapped = {
       console.log('email.updated', result);
       const { emailMessage } = result;
       const data1 = pick(result, ['conversationid', 'opi_sn', 'coli_sn', 'coli_id']);
-      return isEmpty(result?.emailMessage) ? null : { ...emailMessage, ...data1,  };
+      return isEmpty(result?.emailMessage) ? null : { ...emailMessage, ...data1, msg_source: 'email', msg_direction: 'outbound' };
     },
     contentToRender: (contentObj) => null,
     contentToUpdate: (msgcontent) => ({
@@ -673,11 +673,12 @@ export const parseRenderMessageItem = (msg) => {
           origin: msg.context,
         }),
     msg_source: msg?.msg_source || msg.type,
-    ...((msg.msg_source || 'WABA') === 'WABA' ? {
+    ...((msg.msg_source) === 'WABA' ? {
       whatsapp_msg_type: msg.type,
       waba: msg.msg_direction === 'outbound' ? msg.from : msg.to,
       wabaName: WABAccountsMapped[msg.msg_direction === 'outbound' ? msg.from : msg.to]?.verifiedName,
     } : {
+      whatsapp_msg_type: '',
       waba: '',
       wabaName: '',
     }),
@@ -763,11 +764,12 @@ export const parseRenderMessageList = (messages) => {
       // conversationid: conversationid,
       // title: msg.customerProfile.name,
       // whatsapp_msg_type: (msg.msg_source || 'WABA') === 'WABA' ? msgContent.type : '', // 1.0接口没有msg_source
-      ...((msg.msg_source || 'WABA') === 'WABA' ? {
+      ...((msg.msg_source) === 'WABA' ? {
         whatsapp_msg_type: msgContent.type,
         waba: msg.msg_direction === 'outbound' ? msgContent.from : msgContent.to,
         wabaName: WABAccountsMapped[msg.msg_direction === 'outbound' ? msgContent.from : msgContent.to]?.verifiedName,
       } : {
+        whatsapp_msg_type: '',
         waba: '',
         wabaName: '',
       }),
diff --git a/src/views/Conversations/Online/MessagesList.jsx b/src/views/Conversations/Online/MessagesList.jsx
index 31c3193..371d318 100644
--- a/src/views/Conversations/Online/MessagesList.jsx
+++ b/src/views/Conversations/Online/MessagesList.jsx
@@ -44,9 +44,9 @@ const MessagesList = ({ messages, handlePreview, reference, longListLoading, get
   // eslint-disable-next-line react/display-name
   const MessageBoxWithRef = forwardRef((props, ref) => (
     <div ref={ref}>
-      {props.whatsapp_msg_type
+      {props.msg_source === 'WABA'
         && <BubbleIM {...props} {...{ scrollToMessage, focusMsg, handleContactClick, setNewChatModalVisible, setNewChatFormValues, handlePreview }} />}
-      {props.type === 'email' && <BubbleEmail {...props} onOpenEditor={listProps.onOpenEditor} onOpenEmail={listProps.onOpenEmail} />}
+      {props.msg_source === 'email' && <BubbleEmail {...props} onOpenEditor={listProps.onOpenEditor} onOpenEmail={listProps.onOpenEmail} />}
     </div>
   ));