diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index ed19100a..b1b71914 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -162,6 +162,7 @@ class ChatPage extends LitElement {
         align-items: center;
         height: auto;
         padding: 5px 5px 5px 7px;
+        overflow: hidden;
     }
 
     .chat-text-area .typing-area .emoji-button {
@@ -353,12 +354,20 @@ class ChatPage extends LitElement {
       flex-direction: column;
       gap: 5px;
       width: 100%;
+      word-break: break-all;
+      text-overflow: ellipsis;
+    overflow: hidden;
+    max-height: 60px;
   }
   .repliedTo-message p {
     margin: 0px;
     padding: 0px;
   }
 
+  .repliedTo-message pre {
+    white-space: pre-wrap;
+  }
+
   .repliedTo-message p mark {
 	background-color: #ffe066;
   border-radius: 0.25em;
@@ -937,12 +946,17 @@ class ChatPage extends LitElement {
                                         <vaadin-icon class="reply-icon" icon="vaadin:reply" slot="icon"></vaadin-icon>
                                         <div class="repliedTo-message">
                                             <p class="senderName">${this.repliedToMessageObj.senderName ? this.repliedToMessageObj.senderName : this.repliedToMessageObj.sender}</p>
-                                            ${unsafeHTML(generateHTML(this.repliedToMessageObj.message, [
+                                            ${this.repliedToMessageObj.toString() === '1' ? html`
+                                        ${this.repliedToMessageObj.message}
+                                        ` : ''}
+                                        ${this.repliedToMessageObj.toString() === '2' ? html`
+                                        ${unsafeHTML(generateHTML(this.repliedToMessageObj.message, [
                     StarterKit,
                     Underline,
                     Highlight
                     // other extensions …
-                  ]))}
+                  ]))}    ` : ''}
+                                            
                                         </div>
                                         <vaadin-icon
                                             class="close-icon"
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
index 5e41b669..fd3392c4 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
@@ -519,7 +519,6 @@ export const chatStyles = css`
   }
 
   #messageContent > * + * {
-    margin-top: 0.75em;
     outline: none;
   }
 
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index 2d46acb9..de34e742 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -576,12 +576,20 @@ class MessageTemplate extends LitElement {
                                              ${repliedToData.senderName ?? cropAddress(repliedToData.sender)}
                                         </p>
                                         <p class="replied-message">
+
+                                        
+                                        ${version.toString() === '1' ? html`
+                                        ${repliedToData.decodedMessage.messageText}
+                                        ` : ''}
+                                        ${version.toString() === '2' ? html`
                                         ${unsafeHTML(generateHTML(repliedToData.decodedMessage.messageText, [
                     StarterKit,
                     Underline,
                     Highlight
                     // other extensions …
                   ]))}
+                                        ` : ''}
+                                        
                                             <!-- ${repliedToData.decodedMessage.messageText} -->
                                         </p>
                                     </div>
@@ -617,8 +625,12 @@ class MessageTemplate extends LitElement {
                                     id="messageContent" 
                                     class="message" 
                                     style=${(image && replacedMessage !== "") &&"margin-top: 15px;"}>
-                                        
+                                        ${version.toString() === '2' ? html`
                                         ${unsafeHTML(messageVersion2)}
+                                        ` : ''}
+                                        ${version.toString() === '1' ? html`
+                                        ${unsafeHTML(this.emojiPicker.parse(replacedMessage))}
+                                        ` : ''}
                                         <div class="${((this.isFirstMessage === false && 
                                             this.isSingleMessageInGroup === true && 
                                             this.isLastMessageInGroup === true) || 
diff --git a/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js b/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
index 607eecfb..30b666c2 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
@@ -46,12 +46,14 @@ class ChatTextEditor extends LitElement {
             align-items: center;
             height: auto;
             width: 100%;
+            overflow: hidden;
 
       }
         .chatbar-container {
             width: 100%;
             display: flex;
             height: auto;
+            overflow: hidden;
         }
 
         .chatbar-caption {
@@ -265,6 +267,11 @@ class ChatTextEditor extends LitElement {
    
   }
 
+  .chatbar-buttons {
+    margin-bottom: 5px;
+    flex-shrink: 0;
+  }
+
   .show-chatbar-buttons {
     display: flex;
     align-items: center;
@@ -293,6 +300,8 @@ class ChatTextEditor extends LitElement {
 .ProseMirror {
     width: 100%;
     box-sizing: border-box;
+    word-break: break-all;
+    display: flex;
 }
 
 .ProseMirror mark {
@@ -322,7 +331,7 @@ class ChatTextEditor extends LitElement {
   font-family: 'Material Symbols Outlined';
   font-weight: normal;
   font-style: normal;
-  font-size: 24px;  /* Preferred icon size */
+  font-size: 18px;  /* Preferred icon size */
   display: inline-block;
   line-height: 1;
   text-transform: none;