diff --git a/src/components/chat/chatTabs.tsx b/src/components/chat/chatTabs.tsx
index 0fe84481..ebdd86bd 100644
--- a/src/components/chat/chatTabs.tsx
+++ b/src/components/chat/chatTabs.tsx
@@ -132,7 +132,7 @@ const ChatTabs = () => {
       <div className="top flex items-center gap-2 h-14 px-5 justify-between">
         <div className="left flex items-center gap-3">
           <p className="text-base text-Gray-950 font-medium leading-tight">
-            Public Chat
+            {selectedChatOption === 'public' ? 'Public Chat' : 'Private Chat'}
           </p>
           <div className="lang h-8 w-[43px] flex items-center justify-center cursor-pointer border border-Gray-300 rounded-[11px] text-sm font-semibold text-Gray-950">
             EN
diff --git a/src/components/chat/messages/message/index.tsx b/src/components/chat/messages/message/index.tsx
index d4819982..b96a591a 100644
--- a/src/components/chat/messages/message/index.tsx
+++ b/src/components/chat/messages/message/index.tsx
@@ -18,6 +18,15 @@ const Message = ({ body, currentUser }: IMessageProps) => {
   );
   const { t } = useTranslation();
 
+  const formatDate = (timeStamp: string) => {
+    const date = new Date(Number(timeStamp));
+    return date.toLocaleString([], {
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit',
+    });
+  };
+
   const render = () => {
     if (body.fromUserId === 'system') {
       return (
@@ -38,7 +47,9 @@ const Message = ({ body, currentUser }: IMessageProps) => {
           <div className="content me w-[calc(100%-48px)] ml-auto">
             <div className="name min-h-5 flex items-center text-sm text-Gray-800 font-medium pb-1.5 capitalize justify-between">
               <p>{t('right-panel.you')}</p>
-              <p className="time text-xs text-Gray-600">8:37AM</p>
+              <p className="time text-xs text-Gray-600">
+                {formatDate(body.sentAt)}
+              </p>
             </div>
             <p
               className="message-content py-2.5 px-3.5 border border-Gray-200 rounded-2xl overflow-hidden rounded-br-none text-base text-Gray-950 break-words"
@@ -60,7 +71,10 @@ const Message = ({ body, currentUser }: IMessageProps) => {
                   {participantName ? '' : ' (offline)'}
                 </span>
               </p>
-              <p className="time text-xs text-Gray-600">8:37AM</p>
+              <p className="time text-xs text-Gray-600">
+                {' '}
+                {formatDate(body.sentAt)}
+              </p>
             </div>
             <p
               className="message-content py-2.5 px-3.5 border border-Gray-200 rounded-2xl overflow-hidden text-base text-Gray-950 break-words rounded-tl-none bg-Gray-50"