diff --git a/src/pages/chat/chat.ts b/src/pages/chat/chat.ts
index 4d14fa7..383732d 100755
--- a/src/pages/chat/chat.ts
+++ b/src/pages/chat/chat.ts
@@ -242,15 +242,13 @@ class ChatElement extends HTMLElement {
         time: new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }),
         type: 'text' as const
     };
-    // Add and display the message immediately
+    
     messageStore.addMessage(this.selectedMemberId, newMessage);
     this.messagesMock = messageStore.getMessages();
     this.loadMemberChat(this.selectedMemberId);
 
-    // Reset the input
     messageInput.value = '';
 
-    // Automatic response after 2 seconds
     setTimeout(() => {
         if (this.selectedMemberId) {
             const autoReply = {
@@ -268,16 +266,15 @@ class ChatElement extends HTMLElement {
         }, 2000);
     }
 
-        // Scroll down the conversation after loading messages
-        private scrollToBottom(container: Element) {
-            (container as HTMLElement).scrollTop = (container as HTMLElement).scrollHeight;
-        }
+    private scrollToBottom(container: Element) {
+        (container as HTMLElement).scrollTop = (container as HTMLElement).scrollHeight;
+    }
     
     
-        // Load the list of members
-        private async loadMemberChat(memberId: string | number) {
-            this.selectedMemberId = String(memberId);
-            const memberMessages = this.messagesMock.find(m => String(m.memberId) === String(memberId));
+    // Load the list of members
+    private async loadMemberChat(memberId: string | number) {
+        this.selectedMemberId = String(memberId);
+        const memberMessages = this.messagesMock.find(m => String(m.memberId) === String(memberId));
     
             const chatHeader = this.shadowRoot?.querySelector('#chat-header');
             const messagesContainer = this.shadowRoot?.querySelector('#messages');
@@ -301,8 +298,11 @@ class ChatElement extends HTMLElement {
                         messageContent.innerHTML = `<a href="${message.fileData}" download="${message.fileName}" target="_blank">${message.fileName}</a>`;
                         messageContent.classList.add('user');
                     } else {
-                        const senderEmojis = await addressToEmoji(memberAddress);
-                        messageContent.innerHTML = `<strong>${senderEmojis}</strong>: ${message.text} <span style="float: right;">${message.time}</span>`;
+                        const senderDisplay = message.sender === "4NK" 
+                            ? "Me"
+                            : await addressToEmoji(memberAddress);
+                        
+                        messageContent.innerHTML = `<strong>${senderDisplay}</strong>: ${message.text} <span style="float: right;">${message.time}</span>`;
                         if (message.sender === "4NK") {
                             messageContent.classList.add('user');
                         }
@@ -310,11 +310,11 @@ class ChatElement extends HTMLElement {
     
                     messageElement.appendChild(messageContent);
                     messagesContainer.appendChild(messageElement);
-                }
             }
-    
-            this.scrollToBottom(messagesContainer);
         }
+    
+        this.scrollToBottom(messagesContainer);
+    }
 
     private async toggleMembers(roleData: any, roleElement: HTMLElement) {
         let memberList = roleElement.querySelector('.member-list');