diff --git a/packages/react/src/views/ChatHeader/ChatHeader.js b/packages/react/src/views/ChatHeader/ChatHeader.js
index 5a57a32b2..6ad5936e7 100644
--- a/packages/react/src/views/ChatHeader/ChatHeader.js
+++ b/packages/react/src/views/ChatHeader/ChatHeader.js
@@ -28,6 +28,7 @@ import useFetchChatData from '../../hooks/useFetchChatData';
 import useSettingsStore from '../../store/settingsStore';
 import useChatHeaderStyles from './ChatHeader.styles';
 import useSetExclusiveState from '../../hooks/useSetExclusiveState';
+import { Markdown } from '../Markdown';
 
 const ChatHeader = ({
   isClosable,
@@ -96,8 +97,10 @@ const ChatHeader = ({
   const headerTitle = useMessageStore((state) => state.headerTitle);
   const filtered = useMessageStore((state) => state.filtered);
   const setFilter = useMessageStore((state) => state.setFilter);
-  const threadTitle = useMessageStore((state) => state.threadMainMessage?.msg);
+
   const isThreadOpen = useMessageStore((state) => state.isThreadOpen);
+  const threadMessage = useMessageStore((state) => state.threadMainMessage);
+
   const closeThread = useMessageStore((state) => state.closeThread);
 
   const setShowMembers = useMemberStore((state) => state.setShowMembers);
@@ -442,7 +445,7 @@ const ChatHeader = ({
       </Box>
       {isThreadOpen && (
         <DynamicHeader
-          title={threadTitle}
+          title={<Markdown body={threadMessage} isReaction={false} />}
           handleClose={closeThread}
           iconName="arrow-back"
         />
diff --git a/packages/react/src/views/ChatInput/ChatInput.js b/packages/react/src/views/ChatInput/ChatInput.js
index 01646eb24..7ea5e9b3f 100644
--- a/packages/react/src/views/ChatInput/ChatInput.js
+++ b/packages/react/src/views/ChatInput/ChatInput.js
@@ -33,6 +33,7 @@ import { useChatInputStyles } from './ChatInput.styles';
 import useShowCommands from '../../hooks/useShowCommands';
 import useSearchMentionUser from '../../hooks/useSearchMentionUser';
 import formatSelection from '../../lib/formatSelection';
+import { Markdown } from '../Markdown';
 
 const ChatInput = ({ scrollToBottom }) => {
   const { styleOverrides, classNames } = useComponentOverrides('ChatInput');
@@ -153,7 +154,7 @@ const ChatInput = ({ scrollToBottom }) => {
       messageRef.current.value =
         editMessage.attachments[0]?.description || editMessage.msg;
     } else if (editMessage.msg) {
-      messageRef.current.value = editMessage.msg;
+      messageRef.current.value = <Markdown body={editMessage} />;
     } else {
       messageRef.current.value = '';
     }
diff --git a/packages/react/src/views/Message/MessageToolbox.js b/packages/react/src/views/Message/MessageToolbox.js
index 0d911526c..2ef2902c4 100644
--- a/packages/react/src/views/Message/MessageToolbox.js
+++ b/packages/react/src/views/Message/MessageToolbox.js
@@ -11,7 +11,7 @@ import {
   appendClassNames,
 } from '@embeddedchat/ui-elements';
 import { EmojiPicker } from '../EmojiPicker';
-import { parseEmoji } from '../../lib/emoji';
+import { Markdown } from '../Markdown';
 import { useMessageToolboxStyles } from './Message.styles';
 
 export const MessageToolbox = ({
@@ -250,7 +250,7 @@ export const MessageToolbox = ({
               padding: '0 0.5rem 0.5rem',
             }}
           >
-            {parseEmoji(message.msg)}
+            <Markdown body={message} isReaction={false} />
           </Modal.Content>
           <Modal.Footer>
             <Button type="secondary" onClick={handleOnClose}>
diff --git a/packages/react/src/views/QuoteMessage/QuoteMessage.js b/packages/react/src/views/QuoteMessage/QuoteMessage.js
index 2daca1c41..caabb36f3 100644
--- a/packages/react/src/views/QuoteMessage/QuoteMessage.js
+++ b/packages/react/src/views/QuoteMessage/QuoteMessage.js
@@ -10,6 +10,7 @@ import {
 import RCContext from '../../context/RCInstance';
 import { useMessageStore } from '../../store';
 import useQuoteMessageStyles from './QuoteMessage.styles';
+import { Markdown } from '../Markdown';
 
 const QuoteMessage = ({ className = '', style = {}, message }) => {
   const { RCInstance } = useContext(RCContext);
@@ -43,11 +44,13 @@ const QuoteMessage = ({ className = '', style = {}, message }) => {
         <Box>{format(new Date(message.ts), 'h:mm a')}</Box>
       </Box>
       <Box css={styles.message}>
-        {message.msg
-          ? message.msg
-          : `${message.file?.name} (${
-              message.file?.size ? (message.file.size / 1024).toFixed(2) : 0
-            } kB)`}
+        {message.msg ? (
+          <Markdown body={message} isReaction={false} />
+        ) : (
+          `${message.file?.name} (${
+            message.file?.size ? (message.file.size / 1024).toFixed(2) : 0
+          } kB)`
+        )}
       </Box>
     </Box>
   );