diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 6ffc9a1..c518a40 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -61,7 +61,9 @@ const encodeEmailInfo = (info) => {
  */
 export const getEmailDetailAction = async (param) => {
   const { result } = await fetchJSON(`${EMAIL_HOST}/getmail`, param);
-  return { info: encodeEmailInfo(result.MailInfo?.[0] || {}), content: (result.MailContent || '').replace(/[\r\n]/g, '<br />'), attachments: result?.AttachList || [] };
+  const mailType = result.MailInfo?.[0]?.MAI_ContentType || '';
+
+  return { info: encodeEmailInfo(result.MailInfo?.[0] || {}), content: mailType === 'text/html' ? (result.MailContent || '').replace(/[\r\n]/g, '') : (result.MailContent || ''), attachments: result?.AttachList || [] };
 }
 
 /**
diff --git a/src/views/Conversations/Online/Components/EmailDetail.jsx b/src/views/Conversations/Online/Components/EmailDetail.jsx
index 39e5dc4..38b93d1 100644
--- a/src/views/Conversations/Online/Components/EmailDetail.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetail.jsx
@@ -189,7 +189,7 @@ const EmailDetail = ({ open, setOpen, emailMsg={}, ...props }) => {
               </div>
             )}
             <Divider className='my-2' />
-            <div className='mt-2' dangerouslySetInnerHTML={{ __html: mailData.content }}></div>
+            <div className='mt-2 whitespace-pre-wrap' dangerouslySetInnerHTML={{ __html: mailData.content }}></div>
           </div>
         </div>
       </DnDModal>