diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
index 845cbff9..c4ae9c4e 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
@@ -541,6 +541,7 @@ export const chatStyles = css`
     font-family: 'JetBrainsMono', monospace;
     padding: 0.75rem 1rem;
     border-radius: 0.5rem;
+	white-space: pre-wrap;
   }
   #messageContent pre code {
       color: inherit;
@@ -603,6 +604,7 @@ export const chatStyles = css`
     font-family: 'JetBrainsMono', monospace;
     padding: 0.75rem 1rem;
     border-radius: 0.5rem;
+	white-space: pre-wrap;
   }
   .replied-message pre code {
       color: inherit;
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index d325ac4d..e2212e19 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -5,7 +5,6 @@ import { translate, get } from 'lit-translate';
 import {unsafeHTML} from 'lit/directives/unsafe-html.js';
 import { chatStyles } from './ChatScroller-css.js'
 import { Epml } from "../../../epml";
-import { EmojiPicker } from 'emoji-picker-js';
 import { cropAddress } from "../../utils/cropAddress";
 import './LevelFounder.js';
 import './NameMenu.js';
@@ -19,7 +18,6 @@ import '@material/mwc-button';
 import '@material/mwc-dialog';
 import '@material/mwc-icon';
 import { EmojiPicker } from 'emoji-picker-js';
-import { cropAddress } from "../../utils/cropAddress";
 import { generateHTML } from '@tiptap/core'
 import StarterKit from '@tiptap/starter-kit'
 import Underline from '@tiptap/extension-underline';
diff --git a/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js b/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
index 6ce77fbc..8b6d4d08 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
@@ -56,7 +56,9 @@ class ChatTextEditor extends LitElement {
         .chatbar-caption {
             border-bottom: 2px solid var(--mdc-theme-primary);
         }
-
+        .privateMessageMargin {
+            margin-bottom: 12px;
+        }
         .emoji-button {
             width: 45px;
             height: 40px;
@@ -154,6 +156,9 @@ class ChatTextEditor extends LitElement {
             overflow: auto;
             color: var(--black);
             padding: 0px 10px;
+            height: 100%;
+    display: flex;
+    align-items: center;
         }
         .element::-webkit-scrollbar-track {
                         background-color: whitesmoke;
@@ -214,6 +219,7 @@ class ChatTextEditor extends LitElement {
     font-family: 'JetBrainsMono', monospace;
     padding: 0.75rem 1rem;
     border-radius: 0.5rem;
+    white-space: pre-wrap;
   }
   .ProseMirror pre code {
       color: inherit;
@@ -269,6 +275,16 @@ class ChatTextEditor extends LitElement {
   height: 0;
   pointer-events: none;
 }
+.ProseMirror p {
+    font-size: 18px;
+    margin-block-start: 0px;
+    margin-block-end: 0px;
+}
+
+.ProseMirror {
+    width: 100%;
+    box-sizing: border-box;
+}
   
 		`
 	}
@@ -378,7 +394,9 @@ class ChatTextEditor extends LitElement {
                 </div>
                 <textarea style="color: var(--black);" tabindex='1' ?autofocus=${true} ?disabled=${this.isLoading || this.isLoadingMessages} id="messageBox" rows="1"></textarea>
                 <!-- <iframe style=${(this.iframeId === "newChat" && this.iframeHeight > 42) && "height: 100%;"} id=${this.iframeId}  class="chat-editor"  tabindex="-1" height=${this.iframeHeight}></iframe> -->
-                <div id=${this.iframeId} class="element"></div>
+                <div id=${this.iframeId}
+                class=${["element", this.iframeId === "privateMessage" ? "privateMessageMargin" : ""].join(" ")}
+                ></div>
                 <button class="emoji-button" ?disabled=${this.isLoading || this.isLoadingMessages}>
                     ${html`<img class="emoji" draggable="false" alt="😀" src="/emoji/svg/1f600.svg" />`}
                 </button>
@@ -540,7 +558,7 @@ class ChatTextEditor extends LitElement {
                 this.chatMessageSize = 0;
             }
         }
-        if (changedProperties && changedProperties.has('placeholder')) {
+        if (changedProperties && changedProperties.has('placeholder') && this.updatePlaceholder && this.editor) {
             this.updatePlaceholder(this.editor, this.placeholder )
         }
        
diff --git a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
index 86e43929..7d0e4d27 100644
--- a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
+++ b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
@@ -14,7 +14,6 @@ import '../../components/ChatHead.js'
 import '../../components/ChatPage.js'
 import '../../components/WrapperModal.js';
 import '../../components/ChatSeachResults.js';
-import '../../components/ChatGroupsManagement.js'
 import snackbar from '../../components/snackbar.js'
 import '@polymer/paper-spinner/paper-spinner-lite.js'
 import '@material/mwc-button'
@@ -168,7 +167,6 @@ class Chat extends LitElement {
                             this.openPrivateMessage = true;
                             }}>${translate("chatpage.cchange1")}
                         </div>
-                        <chat-groups-management></chat-groups-management>
                     </div>
                     <ul class="list">
                         ${this.isEmptyArray(this.chatHeads) ? this.renderLoadingText() : this.renderChatHead(this.chatHeads)}
@@ -213,7 +211,7 @@ class Chat extends LitElement {
                                     ?disabled=${this.isLoading} 
                                     id="sendTo" 
                                     placeholder="${translate("chatpage.cchange7")}" 
-                                    value=${this.userSelected.name}
+                                    value=${this.userSelected.name ? this.userSelected.name: ''}
                                     @keypress=${() => {
                                         this.userSelected = {};
                                         this.requestUpdate();