diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index 1802fee..912a178 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -350,8 +350,15 @@ const messageSlice = (set, get) => ({
         unread_msg_count: 0,
         whatsapp_name: message.to, //message?.senderName || message?.sender || '',
         customer_name: message.to, // message?.senderName || message?.sender || '',
-        whatsapp_phone_number: message.to,
         conversation_expiretime: message?.conversation?.expireTime || '', // 保留使用UTC时间
+        whatsapp_phone_number: message.type === 'email' ? null : message.to,
+        show_default: message.to || '',
+        last_message: message,
+        channels: {
+          "email": message.type === 'email' ? message.from : null,
+          "phone_number": message.type === 'email' ? null : message.from,
+          "whatsapp_phone_number": message.type === 'email' ? null : message.from,
+        },
       }];
     }
 
diff --git a/src/views/Conversations/Online/Components/ChatListItem.jsx b/src/views/Conversations/Online/Components/ChatListItem.jsx
index d579b98..4f1cdeb 100644
--- a/src/views/Conversations/Online/Components/ChatListItem.jsx
+++ b/src/views/Conversations/Online/Components/ChatListItem.jsx
@@ -256,7 +256,7 @@ const ChatListItem = (({item, refreshConversationList,setListUpdateFlag,onSwitch
             {...item}
             key={item.sn}
             id={item.sn}
-            letterItem={{ id: item.show_default, letter: (item.show_default).slice(0, 5) }}
+            letterItem={{ id: item.show_default, letter: (item?.show_default || '').split("@")[0].slice(0, 5) }}
             alt={item.whatsapp_name}
             title={
               <span>