diff --git a/src/components/Lnbc/Lnbc.tsx b/src/components/Lnbc/Lnbc.tsx
index 106f5a8..54a40aa 100644
--- a/src/components/Lnbc/Lnbc.tsx
+++ b/src/components/Lnbc/Lnbc.tsx
@@ -22,7 +22,13 @@ import { useIntl } from '@cookbook/solid-intl';
 import { lnInvoice } from '../../translations';
 
 
-const Lnbc: Component< { id?: string, lnbc: string, alternative?: boolean, noBack?: boolean } > = (props) => {
+const Lnbc: Component< {
+  id?: string,
+  lnbc: string,
+  alternative?: boolean,
+  noBack?: boolean,
+  inactive?: boolean,
+} > = (props) => {
 
   const app = useAppContext();
   const toast = useToastContext();
@@ -86,6 +92,8 @@ const Lnbc: Component< { id?: string, lnbc: string, alternative?: boolean, noBac
   });
 
   const payInvoice = () => {
+    if (props.inactive) return;
+
     setPaymentInProgress(() => true);
     const walletSocket = new WebSocket('wss://wallet.primal.net/v1');
 
@@ -106,6 +114,8 @@ const Lnbc: Component< { id?: string, lnbc: string, alternative?: boolean, noBac
   };
 
   const sendPayment = async (socket: WebSocket, then?: (success: boolean) => void) => {
+    if (props.inactive) return;
+
     const subId = `sp_${APP_ID}`;
 
     let success = true;
@@ -181,6 +191,8 @@ const Lnbc: Component< { id?: string, lnbc: string, alternative?: boolean, noBac
             <ButtonGhost
               onClick={(e: MouseEvent) => {
                 e.preventDefault();
+                if (props.inactive) return;
+
                 app?.actions.openLnbcModal(props.lnbc, () => {
                   app.actions.closeLnbcModal();
                   confirmPayment();
@@ -199,6 +211,8 @@ const Lnbc: Component< { id?: string, lnbc: string, alternative?: boolean, noBac
             <ButtonGhost
               onClick={(e: MouseEvent) => {
                 e.preventDefault()
+                if (props.inactive) return;
+
                 navigator.clipboard.writeText(props.lnbc);
                 setInvoiceCopied(() => true);
               }}
@@ -229,7 +243,7 @@ const Lnbc: Component< { id?: string, lnbc: string, alternative?: boolean, noBac
           <div class={styles.payAction}>
             <ButtonPrimary onClick={(e: MouseEvent) => {
               e.preventDefault();
-              confirmPayment();
+              !props.inactive && confirmPayment();
             }}>
               {intl.formatMessage(lnInvoice.pay)}
             </ButtonPrimary>
diff --git a/src/components/NewNote/EditBox/EditBox.tsx b/src/components/NewNote/EditBox/EditBox.tsx
index dcf7000..c3442a7 100644
--- a/src/components/NewNote/EditBox/EditBox.tsx
+++ b/src/components/NewNote/EditBox/EditBox.tsx
@@ -1,9 +1,9 @@
 import { useIntl } from "@cookbook/solid-intl";
 import { Router, useLocation } from "@solidjs/router";
 import { nip19 } from "nostr-tools";
-import { Component, createEffect, createSignal, For, onCleanup, onMount, Show } from "solid-js";
+import { Component, createEffect, createSignal, For, Match, onCleanup, onMount, Show, Switch } from "solid-js";
 import { createStore, reconcile, unwrap } from "solid-js/store";
-import { noteRegex, profileRegex, Kind, editMentionRegex, emojiSearchLimit, profileRegexG } from "../../../constants";
+import { noteRegex, profileRegex, Kind, editMentionRegex, emojiSearchLimit, profileRegexG, linebreakRegex } from "../../../constants";
 import { useAccountContext } from "../../../contexts/AccountContext";
 import { useSearchContext } from "../../../contexts/SearchContext";
 import { TranslatorProvider } from "../../../contexts/TranslatorContext";
@@ -43,6 +43,7 @@ import ConfirmAlternativeModal from "../../ConfirmModal/ConfirmAlternativeModal"
 import { readNoteDraft, readNoteDraftUserRefs, saveNoteDraft, saveNoteDraftUserRefs } from "../../../lib/localStore";
 import Uploader from "../../Uploader/Uploader";
 import { logError } from "../../../lib/logger";
+import Lnbc from "../../Lnbc/Lnbc";
 
 type AutoSizedTextArea = HTMLTextAreaElement & { _baseScrollHeight: number };
 
@@ -105,6 +106,21 @@ const EditBox: Component<{
 
   let currentPath = location.pathname;
 
+
+  const noteHasInvoice = (text: string) => {
+    const r =/(\s+|\r\n|\r|\n|^)lnbc[a-zA-Z0-9]+/;
+    const test = r.test(text);
+
+    return test
+  };
+
+  const noteHasCashu = (text: string) => {
+    const r =/(\s+|\r\n|\r|\n|^)cashuA[a-zA-Z0-9]+/;
+    const test = r.test(text);
+
+    return test
+  };
+
   const getScrollHeight = (elm: AutoSizedTextArea) => {
     var savedValue = elm.value
     elm.value = ''
@@ -157,6 +173,74 @@ const EditBox: Component<{
     }
   });
 
+
+  const renderMessage = () => {
+    const text = parsedMessage();
+
+    if (!noteHasInvoice(text)) {
+      return (
+        <div
+          class={styles.editor}
+          ref={textPreview}
+          innerHTML={text}
+        ></div>
+      );
+    };
+
+    let sections: string[] = [];
+
+    let content = text.replace(linebreakRegex, ' __LB__ ').replaceAll('<br>', ' __LB__ ').replace(/\s+/g, ' __SP__ ');
+
+    let tokens: string[] = content.split(/[\s]+/);
+
+    let sectionIndex = 0;
+
+    tokens.forEach((t) => {
+      if (t.startsWith('lnbc')) {
+        if (sections[sectionIndex]) sectionIndex++;
+
+        sections[sectionIndex] = t;
+
+        sectionIndex++;
+      }
+      else {
+        let c = t;
+        const prev = sections[sectionIndex] || '';
+
+        if (t === '__SP__') {
+          c = prev.length === 0 ? '' : ' ';
+        }
+
+        if (t === '__LB__') {
+          c = prev.length === 0 ? '' : ' <br/>';
+        }
+
+        sections[sectionIndex] = prev + c;
+      }
+    });
+
+    return (
+      <div
+        class={styles.editor}
+        ref={textPreview}
+      >
+        <For each={sections}>
+          {section => (
+            <Switch fallback={
+              <div
+                innerHTML={section}
+              ></div>
+            }>
+              <Match when={section.startsWith('lnbc')}>
+                <Lnbc lnbc={section} inactive={true} />
+              </Match>
+            </Switch>
+          )}
+        </For>
+      </div>
+    );
+  };
+
   const onKeyDown = (e: KeyboardEvent) => {
     if (!textArea) {
       return false;
@@ -1283,11 +1367,7 @@ const EditBox: Component<{
           class={styles.editorScroll}
           id={`${prefix()}new_note_text_preview`}
         >
-          <div
-            class={styles.editor}
-            ref={textPreview}
-            innerHTML={parsedMessage()}
-          ></div>
+          {renderMessage()}
           <div class={styles.uploader}>
             <Uploader
               publicKey={account?.publicKey}