diff --git a/src/channel/whatsappUtils.js b/src/channel/whatsappUtils.js
index 9d363c7..7698c10 100644
--- a/src/channel/whatsappUtils.js
+++ b/src/channel/whatsappUtils.js
@@ -382,6 +382,7 @@ export const whatsappMsgTypeMapped = {
     type: 'video',
     data: (msg) => ({
       id: msg.wamid,
+      text: msg.video.caption,
       data: {
         id: msg.wamid,
         videoURL: msg.video.link,
@@ -432,7 +433,7 @@ export const whatsappMsgTypeMapped = {
     data: (msg) => ({
       id: msg.wamid,
       title: msg.document?.filename || '',
-      text: (msg.document?.filename || '') + `\n${msg.document?.caption || ''}`,
+      text: msg.document?.caption || msg.document?.filename || '',
       data: { uri: msg.document.link, status: { click: false, download: true, loading: 0 } },
       originText: msg.document?.caption || msg.document?.filename || '',
     }),
diff --git a/src/views/Conversations/Conversations.css b/src/views/Conversations/Conversations.css
index 9498694..df12ffe 100644
--- a/src/views/Conversations/Conversations.css
+++ b/src/views/Conversations/Conversations.css
@@ -188,6 +188,17 @@
 }
 .chatwindow-wrapper .rce-mbox-file>button{
     width: 100%;
+    text-align: left;
+}
+.chatwindow-wrapper .rce-mbox-file>button>.rce-mbox-file--text{
+    color: rgba(0, 0, 0, 0.78);
+}
+
+.chatwindow-wrapper .rce-mbox-reply-message{
+    max-width: unset;
+    overflow: unset;
+    text-overflow: unset;
+    white-space: unset;
 }
 
 /** Chat history ------------------------------------------------------------------------------------ */
diff --git a/src/views/Conversations/History/MessagesList.jsx b/src/views/Conversations/History/MessagesList.jsx
index f7f54f8..fa53ad7 100644
--- a/src/views/Conversations/History/MessagesList.jsx
+++ b/src/views/Conversations/History/MessagesList.jsx
@@ -148,7 +148,7 @@ const MessagesList = ({ ...props }) => {
       return prev;
     }, []);
     return (
-      <span className={`text-sm leading-5 emoji-text ${className} ${extraClass} `} key={'msg-text'}>
+      <span className={`text-sm leading-5 emoji-text whitespace-pre-wrap ${className} ${extraClass} `} key={'msg-text'}>
         {(objArr || []).map((part, index) => {
           if (part.type === 'link') {
             return (