diff --git a/src/views/Conversations/Components/Input/Template.jsx b/src/views/Conversations/Components/Input/Template.jsx
index 18fc013..ec17641 100644
--- a/src/views/Conversations/Components/Input/Template.jsx
+++ b/src/views/Conversations/Components/Input/Template.jsx
@@ -186,7 +186,7 @@ const InputTemplate = ({ mobile, disabled = false, invokeSendMessage }) => {
         trigger='click'
         open={openTemplates}
         onOpenChange={setOpenTemplates}>
-        <Button type='text' className='' icon={<MessageOutlined />} size={'middle'} disabled={disabled} />
+        <Button type='text' className='' icon={<MessageOutlined />} size={'middle'} disabled={false} />
       </Popover>
     </>
   );
diff --git a/src/views/Conversations/Components/MessagesWrapper.jsx b/src/views/Conversations/Components/MessagesWrapper.jsx
index fc217e4..1595428 100644
--- a/src/views/Conversations/Components/MessagesWrapper.jsx
+++ b/src/views/Conversations/Components/MessagesWrapper.jsx
@@ -25,21 +25,28 @@ const MessagesWrapper = () => {
   const [longListLoading, setLongListLoading] = useState(false);
   const [shouldScrollBottom, setShouldScrollBottom] = useState(true);
   useEffect(() => {
-    setLongList(activeMessages);
-    setShouldScrollBottom(true);
     if (currentConversation.sn && activeMessages.length < 20) {
       getFirstPageMessages(currentConversation);
     }
-    if (currentConversation.opi_sn && currentConversation.whatsapp_phone_number && activeMessages.length > 0) {
-      fetchCleanUnreadMsgCount({ opisn: currentConversation.opi_sn, whatsappid: currentConversation.whatsapp_phone_number });
-      refreshTotalNotify();
-    }
+    setShouldScrollBottom(true);
+    return () => {};
+  }, [currentConversation.sn]);
+
+  useEffect(() => {
+    setLongList(activeMessages);
     const thisLastTime = activeMessages.length > 0 ? activeMessages[0].orgmsgtime : '';
     const loadNextPage = !(activeMessages.length === 0 || activeMessages.length < MESSAGE_PAGE_SIZE);
     updateCurrentConversation({ lasttime: thisLastTime, loadNextPage });
+    return () => {};
+  }, [activeMessages]);
 
+  useEffect(() => {
+    if (currentConversation.opi_sn && currentConversation.whatsapp_phone_number && activeMessages.length > 0) {
+      fetchCleanUnreadMsgCount({ opisn: currentConversation.opi_sn, whatsappid: currentConversation.whatsapp_phone_number });
+      refreshTotalNotify();
+    }
     return () => {};
-  }, [activeMessages, currentConversation.sn]);
+  }, [activeMessages.length]);
 
 
   const getFirstPageMessages = async (item) => {
diff --git a/src/views/MobileApp.jsx b/src/views/MobileApp.jsx
index 8574d88..3ca46d3 100644
--- a/src/views/MobileApp.jsx
+++ b/src/views/MobileApp.jsx
@@ -22,7 +22,7 @@ function MobileApp() {
       <Header className='header' style={{ position: 'sticky', top: 0, zIndex: 1, width: '100%', background: 'white' }}>
         <Row gutter={{ md: 24 }} align='middle'>
           <Col flex="auto" style={{ color: "white", marginBottom: "0", display: "flex", justifyContent: "center" }}>
-            <NavLink to='/'>
+            <NavLink to='/m/conversation'>
               <img src={AppLogo} className='logo' alt='App logo' />
             </NavLink>
             <Space><Avatar