diff --git a/public/healthz.json b/public/healthz.json
index 59dd86e..b191b11 100644
--- a/public/healthz.json
+++ b/public/healthz.json
@@ -2,7 +2,7 @@
   "status": "ok",
   "service": "aitherboard",
   "version": "0.2.0",
-  "buildTime": "2026-02-06T17:22:41.111Z",
+  "buildTime": "2026-02-06T17:29:48.880Z",
   "gitCommit": "unknown",
-  "timestamp": 1770398561111
+  "timestamp": 1770398988880
 }
\ No newline at end of file
diff --git a/src/lib/components/write/AdvancedEditor.svelte b/src/lib/components/write/AdvancedEditor.svelte
index b4cf284..a94ea4e 100644
--- a/src/lib/components/write/AdvancedEditor.svelte
+++ b/src/lib/components/write/AdvancedEditor.svelte
@@ -10,6 +10,13 @@
   import { StreamLanguage } from '@codemirror/language';
   import { asciidoc } from 'codemirror-asciidoc';
   import { oneDark } from '@codemirror/theme-one-dark';
+  import { sessionManager } from '../../services/auth/session-manager.js';
+  import { uploadFileToServer, buildImetaTag } from '../../services/nostr/file-upload.js';
+  import GifPicker from '../content/GifPicker.svelte';
+  import EmojiPicker from '../content/EmojiPicker.svelte';
+  import MarkdownRenderer from '../content/MarkdownRenderer.svelte';
+  import MediaAttachments from '../content/MediaAttachments.svelte';
+  import type { NostrEvent } from '../../types/nostr.js';
 
   interface Props {
     value: string;
@@ -24,6 +31,21 @@
   let editorView: EditorView | null = $state(null);
   let isDark = $state(false);
   let initialized = $state(false);
+  
+  // Toolbar state
+  let showGifPicker = $state(false);
+  let showEmojiPicker = $state(false);
+  let showPreviewModal = $state(false);
+  let showJsonModal = $state(false);
+  let fileInputRef: HTMLInputElement | null = $state(null);
+  let uploading = $state(false);
+  let uploadedFiles: Array<{ url: string; imetaTag: string[] }> = $state([]);
+  let previewContent = $state<string>('');
+  let previewEvent = $state<NostrEvent | null>(null);
+  let eventJson = $state('{}');
+  
+  // Generate unique ID for file input
+  const fileInputId = `advanced-editor-file-upload-${Math.random().toString(36).substring(7)}`;
 
   // Check for dark mode preference
   onMount(() => {
@@ -145,6 +167,583 @@
       onClose();
     }
   }
+
+  // Insert text at cursor in CodeMirror (replaces selection if any)
+  function insertTextAtCursor(text: string, cursorOffset?: number) {
+    if (!editorView) return;
+    
+    const state = editorView.state;
+    const selection = state.selection.main;
+    const from = selection.from;
+    const to = selection.to;
+    const offset = cursorOffset !== undefined ? cursorOffset : text.length;
+    
+    editorView.dispatch({
+      changes: { from, to, insert: text },
+      selection: { anchor: from + offset }
+    });
+    
+    editorView.focus();
+  }
+
+  function handleGifSelect(gifUrl: string) {
+    insertTextAtCursor(gifUrl);
+    showGifPicker = false;
+  }
+
+  function handleEmojiSelect(emoji: string) {
+    insertTextAtCursor(emoji);
+    showEmojiPicker = false;
+  }
+
+  function handleTagInsert() {
+    const tag = prompt('Enter tag name (without #):');
+    if (tag && tag.trim()) {
+      insertTextAtCursor(`#${tag.trim()}`);
+    }
+  }
+
+  function insertNostrIdentifier() {
+    const type = prompt('Nostr identifier type (npub, nprofile, nevent, naddr, note):', 'npub');
+    if (!type) return;
+    
+    const identifier = prompt('Enter identifier (with or without nostr: prefix):', '');
+    if (identifier && identifier.trim()) {
+      // Add nostr: prefix if not present
+      const prefixed = identifier.trim().startsWith('nostr:') 
+        ? identifier.trim() 
+        : `nostr:${identifier.trim()}`;
+      insertTextAtCursor(prefixed);
+    }
+  }
+
+  // Get selected text or placeholder
+  function getSelectedText(): { text: string; from: number; to: number } {
+    if (!editorView) return { text: '', from: 0, to: 0 };
+    
+    const state = editorView.state;
+    const selection = state.selection.main;
+    const from = selection.from;
+    const to = selection.to;
+    const text = state.doc.sliceString(from, to);
+    
+    return { text, from, to };
+  }
+
+  // Formatting functions for Markdown
+  function insertMarkdownHeader(level: number) {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      // Wrap selected text in header
+      const headerPrefix = '#'.repeat(level) + ' ';
+      insertTextAtCursor(`${headerPrefix}${text}`);
+    } else {
+      // Insert header template
+      insertTextAtCursor(`${'#'.repeat(level)} Heading ${level}\n`);
+    }
+  }
+
+  function insertMarkdownBold() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`*${text}*`);
+    } else {
+      const template = '**bold text**';
+      insertTextAtCursor(template);
+      // Select "bold text" for easy replacement
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 11, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertMarkdownItalic() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`_${text}_`);
+    } else {
+      insertTextAtCursor('_italic text_');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 12, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertMarkdownStrikethrough() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`~${text}~`);
+    } else {
+      insertTextAtCursor('~strikethrough text~');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 18, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertMarkdownBlockquote() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      const lines = text.split('\n');
+      const quoted = lines.map(line => `> ${line}`).join('\n');
+      insertTextAtCursor(quoted);
+    } else {
+      insertTextAtCursor('> quoted text\n');
+    }
+  }
+
+  function insertMarkdownList(ordered: boolean) {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      const lines = text.split('\n');
+      const listItems = lines.map((line, i) => 
+        ordered ? `${i + 1}. ${line}` : `* ${line}`
+      ).join('\n');
+      insertTextAtCursor(listItems);
+    } else {
+      insertTextAtCursor(ordered ? '1. List item\n' : '* List item\n');
+    }
+  }
+
+  function insertMarkdownLink() {
+    const text = prompt('Link text:') || 'link text';
+    const url = prompt('URL:') || 'https://example.com';
+    insertTextAtCursor(`[${text}](${url})`);
+  }
+
+  function insertMarkdownImage() {
+    const alt = prompt('Alt text:') || 'image';
+    const url = prompt('Image URL:') || 'https://example.com/image.jpg';
+    insertTextAtCursor(`![${alt}](${url})`);
+  }
+
+  function insertMarkdownCodeBlock() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`\`\`\`\n${text}\n\`\`\``);
+    } else {
+      insertTextAtCursor('```\ncode here\n```');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 9, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertMarkdownInlineCode() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`\`${text}\``);
+    } else {
+      insertTextAtCursor('`code`');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 5, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertMarkdownTable() {
+    const table = `| Header 1 | Header 2 | Header 3 |
+|----------|----------|----------|
+| Cell 1   | Cell 2   | Cell 3   |
+| Cell 4   | Cell 5   | Cell 6   |`;
+    insertTextAtCursor(table);
+  }
+
+  function insertMarkdownHorizontalRule() {
+    insertTextAtCursor('\n---\n');
+  }
+
+  // Formatting functions for AsciiDoc
+  function insertAsciiDocHeader(level: number) {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      const headerPrefix = '='.repeat(level) + ' ';
+      insertTextAtCursor(`${headerPrefix}${text}`);
+    } else {
+      insertTextAtCursor(`${'='.repeat(level)} Heading ${level}\n`);
+    }
+  }
+
+  function insertAsciiDocBold() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`*${text}*`);
+    } else {
+      insertTextAtCursor('*bold text*');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 10, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertAsciiDocItalic() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`_${text}_`);
+    } else {
+      insertTextAtCursor('_italic text_');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 12, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertAsciiDocStrikethrough() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`[.line-through]#${text}#`);
+    } else {
+      insertTextAtCursor('[.line-through]#strikethrough text#');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 19, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertAsciiDocBlockquote() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`[quote]\n____\n${text}\n____`);
+    } else {
+      insertTextAtCursor('[quote]\n____\nQuoted text\n____');
+    }
+  }
+
+  function insertAsciiDocList(ordered: boolean) {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      const lines = text.split('\n');
+      const listItems = lines.map(line => 
+        ordered ? `. ${line}` : `* ${line}`
+      ).join('\n');
+      insertTextAtCursor(listItems);
+    } else {
+      insertTextAtCursor(ordered ? '. List item\n' : '* List item\n');
+    }
+  }
+
+  function insertAsciiDocLink() {
+    const text = prompt('Link text:') || 'link text';
+    const url = prompt('URL:') || 'https://example.com';
+    insertTextAtCursor(`link:${url}[${text}]`);
+  }
+
+  function insertAsciiDocImage() {
+    const alt = prompt('Alt text:') || 'image';
+    const url = prompt('Image URL:') || 'https://example.com/image.jpg';
+    insertTextAtCursor(`image::${url}[${alt}]`);
+  }
+
+  function insertAsciiDocCodeBlock() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`[source]\n----\n${text}\n----`);
+    } else {
+      insertTextAtCursor('[source]\n----\ncode here\n----');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 9, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertAsciiDocInlineCode() {
+    const { text, from, to } = getSelectedText();
+    if (text) {
+      insertTextAtCursor(`\`${text}\``);
+    } else {
+      insertTextAtCursor('`code`');
+      if (editorView) {
+        const state = editorView.state;
+        const pos = state.selection.main.anchor;
+        editorView.dispatch({
+          selection: { anchor: pos - 5, head: pos - 1 }
+        });
+      }
+    }
+  }
+
+  function insertAsciiDocTable() {
+    const table = `[cols="1,1,1"]
+|===
+|Header 1 |Header 2 |Header 3
+
+|Cell 1 |Cell 2 |Cell 3
+|Cell 4 |Cell 5 |Cell 6
+|===`;
+    insertTextAtCursor(table);
+  }
+
+  function insertAsciiDocHorizontalRule() {
+    insertTextAtCursor('\n---\n');
+  }
+
+  // Wrapper functions that choose based on mode
+  function insertHeader(level: number) {
+    if (mode === 'asciidoc') {
+      insertAsciiDocHeader(level);
+    } else {
+      insertMarkdownHeader(level);
+    }
+  }
+
+  function insertBold() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocBold();
+    } else {
+      insertMarkdownBold();
+    }
+  }
+
+  function insertItalic() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocItalic();
+    } else {
+      insertMarkdownItalic();
+    }
+  }
+
+  function insertStrikethrough() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocStrikethrough();
+    } else {
+      insertMarkdownStrikethrough();
+    }
+  }
+
+  function insertBlockquote() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocBlockquote();
+    } else {
+      insertMarkdownBlockquote();
+    }
+  }
+
+  function insertList(ordered: boolean) {
+    if (mode === 'asciidoc') {
+      insertAsciiDocList(ordered);
+    } else {
+      insertMarkdownList(ordered);
+    }
+  }
+
+  function insertLink() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocLink();
+    } else {
+      insertMarkdownLink();
+    }
+  }
+
+  function insertImage() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocImage();
+    } else {
+      insertMarkdownImage();
+    }
+  }
+
+  function insertCodeBlock() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocCodeBlock();
+    } else {
+      insertMarkdownCodeBlock();
+    }
+  }
+
+  function insertInlineCode() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocInlineCode();
+    } else {
+      insertMarkdownInlineCode();
+    }
+  }
+
+  function insertTable() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocTable();
+    } else {
+      insertMarkdownTable();
+    }
+  }
+
+  function insertHorizontalRule() {
+    if (mode === 'asciidoc') {
+      insertAsciiDocHorizontalRule();
+    } else {
+      insertMarkdownHorizontalRule();
+    }
+  }
+
+  async function handleFileUpload(event: Event) {
+    const input = event.target as HTMLInputElement;
+    const files = input.files;
+    if (!files || files.length === 0) return;
+
+    // Filter valid file types
+    const validFiles: File[] = [];
+    for (const file of Array.from(files)) {
+      const isImage = file.type.startsWith('image/');
+      const isVideo = file.type.startsWith('video/');
+      const isAudio = file.type.startsWith('audio/');
+      
+      if (!isImage && !isVideo && !isAudio) {
+        alert(`${file.name} is not an image, video, or audio file`);
+        continue;
+      }
+      validFiles.push(file);
+    }
+
+    if (validFiles.length === 0) {
+      return;
+    }
+
+    if (!sessionManager.isLoggedIn()) {
+      alert('Please log in to upload files');
+      return;
+    }
+
+    uploading = true;
+    const uploadPromises: Promise<void>[] = [];
+
+    // Process all files
+    for (const file of validFiles) {
+      const uploadPromise = (async () => {
+        try {
+          // Upload file to media server
+          const uploadResult = await uploadFileToServer(file, 'AdvancedEditor');
+          console.log(`[AdvancedEditor] Uploaded ${file.name} to ${uploadResult.url}`);
+
+          // Build imeta tag from upload response (NIP-92 format)
+          const imetaTag = buildImetaTag(file, uploadResult);
+          
+          // Store file with imeta tag
+          uploadedFiles.push({
+            url: uploadResult.url,
+            imetaTag
+          });
+          
+          // Insert file URL into editor
+          insertTextAtCursor(`${uploadResult.url}\n`);
+        } catch (error) {
+          console.error(`[AdvancedEditor] File upload failed for ${file.name}:`, error);
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          alert(`Failed to upload ${file.name}: ${errorMessage}`);
+        }
+      })();
+      
+      uploadPromises.push(uploadPromise);
+    }
+
+    // Wait for all uploads to complete
+    try {
+      await Promise.all(uploadPromises);
+    } finally {
+      uploading = false;
+      // Reset file input
+      if (fileInputRef) {
+        fileInputRef.value = '';
+      }
+    }
+  }
+
+  async function handlePreview() {
+    if (!editorView) return;
+    
+    const content = editorView.state.doc.toString();
+    let contentWithUrls = content.trim();
+    
+    // Add uploaded file URLs if not already in content
+    for (const file of uploadedFiles) {
+      if (!contentWithUrls.includes(file.url)) {
+        if (contentWithUrls && !contentWithUrls.endsWith('\n')) {
+          contentWithUrls += '\n';
+        }
+        contentWithUrls += `${file.url}\n`;
+      }
+    }
+    
+    // Process content to add "nostr:" prefix
+    const { processNostrLinks } = await import('../../utils/nostr-link-processor.js');
+    previewContent = processNostrLinks(contentWithUrls.trim());
+    
+    // Build preview event
+    const previewTags: string[][] = [];
+    for (const file of uploadedFiles) {
+      previewTags.push(file.imetaTag);
+    }
+    
+    previewEvent = {
+      kind: 1,
+      pubkey: sessionManager.getCurrentPubkey() || '',
+      created_at: Math.floor(Date.now() / 1000),
+      tags: previewTags,
+      content: previewContent,
+      id: '',
+      sig: ''
+    } as NostrEvent;
+    
+    showPreviewModal = true;
+  }
+
+  async function handleJsonView() {
+    if (!editorView) return;
+    
+    const content = editorView.state.doc.toString();
+    const tags: string[][] = [];
+    
+    for (const file of uploadedFiles) {
+      tags.push(file.imetaTag);
+    }
+    
+    const event = {
+      kind: 1,
+      pubkey: sessionManager.getCurrentPubkey() || '',
+      created_at: Math.floor(Date.now() / 1000),
+      tags,
+      content: content.trim(),
+      id: '',
+      sig: ''
+    };
+    
+    eventJson = JSON.stringify(event, null, 2);
+    showJsonModal = true;
+  }
 </script>
 
 <div class="advanced-editor-modal" role="dialog" aria-modal="true" aria-labelledby="editor-title">
@@ -163,6 +762,250 @@
     </div>
     
     <div class="editor-body">
+      <div class="editor-toolbar">
+        <!-- Formatting Buttons -->
+        <div class="toolbar-group">
+          <button
+            type="button"
+            onclick={() => insertHeader(1)}
+            class="toolbar-button"
+            title="Heading 1"
+            aria-label="Heading 1"
+          >
+            H1
+          </button>
+          <button
+            type="button"
+            onclick={() => insertHeader(2)}
+            class="toolbar-button"
+            title="Heading 2"
+            aria-label="Heading 2"
+          >
+            H2
+          </button>
+          <button
+            type="button"
+            onclick={() => insertHeader(3)}
+            class="toolbar-button"
+            title="Heading 3"
+            aria-label="Heading 3"
+          >
+            H3
+          </button>
+        </div>
+        
+        <div class="toolbar-separator"></div>
+        
+        <div class="toolbar-group">
+          <button
+            type="button"
+            onclick={insertBold}
+            class="toolbar-button"
+            title="Bold"
+            aria-label="Bold"
+          >
+            <strong>B</strong>
+          </button>
+          <button
+            type="button"
+            onclick={insertItalic}
+            class="toolbar-button"
+            title="Italic"
+            aria-label="Italic"
+          >
+            <em>I</em>
+          </button>
+          <button
+            type="button"
+            onclick={insertStrikethrough}
+            class="toolbar-button"
+            title="Strikethrough"
+            aria-label="Strikethrough"
+          >
+            <s>S</s>
+          </button>
+        </div>
+        
+        <div class="toolbar-separator"></div>
+        
+        <div class="toolbar-group">
+          <button
+            type="button"
+            onclick={insertBlockquote}
+            class="toolbar-button"
+            title="Blockquote"
+            aria-label="Blockquote"
+          >
+            "
+          </button>
+          <button
+            type="button"
+            onclick={() => insertList(false)}
+            class="toolbar-button"
+            title="Unordered List"
+            aria-label="Unordered List"
+          >
+            •
+          </button>
+          <button
+            type="button"
+            onclick={() => insertList(true)}
+            class="toolbar-button"
+            title="Ordered List"
+            aria-label="Ordered List"
+          >
+            1.
+          </button>
+        </div>
+        
+        <div class="toolbar-separator"></div>
+        
+        <div class="toolbar-group">
+          <button
+            type="button"
+            onclick={insertLink}
+            class="toolbar-button"
+            title="Link"
+            aria-label="Link"
+          >
+            🔗
+          </button>
+          <button
+            type="button"
+            onclick={insertImage}
+            class="toolbar-button"
+            title="Image"
+            aria-label="Image"
+          >
+            🖼️
+          </button>
+          <button
+            type="button"
+            onclick={insertCodeBlock}
+            class="toolbar-button"
+            title="Code Block"
+            aria-label="Code Block"
+          >
+            &lt;/&gt;
+          </button>
+          <button
+            type="button"
+            onclick={insertInlineCode}
+            class="toolbar-button"
+            title="Inline Code"
+            aria-label="Inline Code"
+          >
+            `</button>
+          <button
+            type="button"
+            onclick={insertTable}
+            class="toolbar-button"
+            title="Table"
+            aria-label="Table"
+          >
+            ⧉
+          </button>
+          <button
+            type="button"
+            onclick={insertHorizontalRule}
+            class="toolbar-button"
+            title="Horizontal Rule"
+            aria-label="Horizontal Rule"
+          >
+            ─
+          </button>
+        </div>
+        
+        <div class="toolbar-separator"></div>
+        
+        <!-- Nostr-specific buttons -->
+        <div class="toolbar-group">
+          <button
+            type="button"
+            onclick={handleTagInsert}
+            class="toolbar-button"
+            title="Insert tag (#hashtag)"
+            aria-label="Insert tag"
+          >
+            #
+          </button>
+          <button
+            type="button"
+            onclick={insertNostrIdentifier}
+            class="toolbar-button"
+            title="Insert Nostr identifier (npub, nevent, etc.)"
+            aria-label="Insert Nostr identifier"
+          >
+            🔑
+          </button>
+          <button
+            type="button"
+            onclick={() => { 
+              showGifPicker = !showGifPicker; 
+              showEmojiPicker = false; 
+            }}
+            class="toolbar-button"
+            title="Insert GIF"
+            aria-label="Insert GIF"
+          >
+            GIF
+          </button>
+          <button
+            type="button"
+            onclick={() => { 
+              showEmojiPicker = !showEmojiPicker; 
+              showGifPicker = false; 
+            }}
+            class="toolbar-button"
+            title="Insert emoji"
+            aria-label="Insert emoji"
+          >
+            😀
+          </button>
+          <input
+            type="file"
+            bind:this={fileInputRef}
+            accept="image/*,video/*,audio/*"
+            multiple
+            onchange={handleFileUpload}
+            class="hidden"
+            id={fileInputId}
+            disabled={uploading}
+          />
+          <label
+            for={fileInputId}
+            class="toolbar-button upload-button"
+            title="Upload file (image, video, or audio)"
+            aria-label="Upload file"
+          >
+            📤
+          </label>
+        </div>
+        
+        <div class="toolbar-separator"></div>
+        
+        <!-- Utility buttons -->
+        <div class="toolbar-group">
+          <button
+            type="button"
+            onclick={handlePreview}
+            class="toolbar-button"
+            title="Preview"
+            aria-label="Preview"
+          >
+            👁️
+          </button>
+          <button
+            type="button"
+            onclick={handleJsonView}
+            class="toolbar-button"
+            title="View JSON"
+            aria-label="View JSON"
+          >
+            {'{ }'}
+          </button>
+        </div>
+      </div>
       <div class="editor-wrapper" bind:this={editorContainer}></div>
     </div>
     
@@ -177,6 +1020,90 @@
   </div>
 </div>
 
+<GifPicker open={showGifPicker} onSelect={handleGifSelect} onClose={() => showGifPicker = false} />
+<EmojiPicker open={showEmojiPicker} onSelect={handleEmojiSelect} onClose={() => showEmojiPicker = false} />
+
+<!-- Preview Modal -->
+{#if showPreviewModal}
+  <div 
+    class="modal-overlay" 
+    onclick={() => showPreviewModal = false}
+    onkeydown={(e) => {
+      if (e.key === 'Escape' || e.key === 'Enter' || e.key === ' ') {
+        e.preventDefault();
+        showPreviewModal = false;
+      }
+    }}
+    role="dialog"
+    aria-modal="true"
+    tabindex="0"
+  >
+    <div 
+      class="modal-content preview-modal" 
+      onclick={(e) => e.stopPropagation()}
+      onkeydown={(e) => e.stopPropagation()}
+      role="none"
+    >
+      <div class="modal-header">
+        <h2>Preview</h2>
+        <button onclick={() => showPreviewModal = false} class="close-button">×</button>
+      </div>
+      <div class="modal-body preview-body">
+        {#if previewEvent && previewContent}
+          <MediaAttachments event={previewEvent} />
+          <MarkdownRenderer content={previewContent} event={previewEvent} />
+        {:else if editorView && editorView.state.doc.toString().trim()}
+          <p class="text-muted">Loading preview...</p>
+        {:else}
+          <p class="text-muted">No content to preview</p>
+        {/if}
+      </div>
+      <div class="modal-footer">
+        <button onclick={() => showPreviewModal = false}>Close</button>
+      </div>
+    </div>
+  </div>
+{/if}
+
+<!-- JSON View Modal -->
+{#if showJsonModal}
+  <div 
+    class="modal-overlay" 
+    onclick={() => showJsonModal = false}
+    onkeydown={(e) => {
+      if (e.key === 'Escape' || e.key === 'Enter' || e.key === ' ') {
+        e.preventDefault();
+        showJsonModal = false;
+      }
+    }}
+    role="dialog"
+    aria-modal="true"
+    tabindex="0"
+  >
+    <div 
+      class="modal-content" 
+      onclick={(e) => e.stopPropagation()}
+      onkeydown={(e) => e.stopPropagation()}
+      role="none"
+    >
+      <div class="modal-header">
+        <h2>Event JSON</h2>
+        <button onclick={() => showJsonModal = false} class="close-button">×</button>
+      </div>
+      <div class="modal-body">
+        <pre class="json-preview">{eventJson}</pre>
+      </div>
+      <div class="modal-footer">
+        <button onclick={() => {
+          navigator.clipboard.writeText(eventJson);
+          alert('JSON copied to clipboard');
+        }}>Copy</button>
+        <button onclick={() => showJsonModal = false}>Close</button>
+      </div>
+    </div>
+  </div>
+{/if}
+
 <style>
   .advanced-editor-modal {
     position: fixed;
@@ -269,6 +1196,87 @@
     min-height: 400px;
   }
 
+  .editor-toolbar {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.75rem 1.5rem;
+    border-bottom: 1px solid var(--fog-border, #e5e7eb);
+    flex-wrap: wrap;
+    position: relative;
+    z-index: 10;
+    min-height: 3.5rem;
+  }
+
+  :global(.dark) .editor-toolbar {
+    border-bottom-color: var(--fog-dark-border, #374151);
+  }
+
+  .toolbar-group {
+    display: flex;
+    gap: 0.25rem;
+    align-items: center;
+    flex-shrink: 0;
+    flex-wrap: nowrap;
+  }
+
+  .toolbar-separator {
+    width: 1px;
+    height: 1.5rem;
+    background: var(--fog-border, #e5e7eb);
+    margin: 0 0.25rem;
+    flex-shrink: 0;
+  }
+
+  :global(.dark) .toolbar-separator {
+    background: var(--fog-dark-border, #374151);
+  }
+
+  .toolbar-button {
+    padding: 0.375rem 0.75rem;
+    font-size: 0.875rem;
+    border: 1px solid var(--fog-border, #e5e7eb);
+    border-radius: 0.25rem;
+    background: var(--fog-highlight, #f3f4f6);
+    color: var(--fog-text, #475569);
+    cursor: pointer;
+    transition: all 0.2s;
+    font-family: inherit;
+    white-space: nowrap;
+    flex-shrink: 0;
+    min-width: fit-content;
+  }
+
+  .toolbar-button:hover:not(:disabled) {
+    background: var(--fog-border, #e5e7eb);
+    border-color: var(--fog-accent, #64748b);
+  }
+
+  .toolbar-button:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  :global(.dark) .toolbar-button {
+    background: var(--fog-dark-highlight, #374151);
+    border-color: var(--fog-dark-border, #475569);
+    color: var(--fog-dark-text, #cbd5e1);
+  }
+
+  :global(.dark) .toolbar-button:hover:not(:disabled) {
+    background: var(--fog-dark-border, #475569);
+    border-color: var(--fog-dark-accent, #94a3b8);
+  }
+
+  .upload-button {
+    cursor: pointer;
+    user-select: none;
+  }
+
+  .hidden {
+    display: none;
+  }
+
   .editor-wrapper {
     flex: 1;
     overflow: hidden;
@@ -281,6 +1289,142 @@
     border-color: var(--fog-dark-border, #374151);
   }
 
+  /* Modal styles */
+  .modal-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(15, 23, 42, 0.75);
+    backdrop-filter: blur(4px);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 3000;
+    padding: 1rem;
+  }
+
+  .modal-content {
+    background: var(--fog-post, #ffffff);
+    border: 1px solid var(--fog-border, #e5e7eb);
+    border-radius: 0.5rem;
+    box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
+    max-width: 90vw;
+    max-height: 90vh;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+
+  :global(.dark) .modal-content {
+    background: var(--fog-dark-post, #1f2937);
+    border-color: var(--fog-dark-border, #374151);
+    box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.3), 0 10px 10px -5px rgba(0, 0, 0, 0.2);
+  }
+
+  .modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 1rem 1.5rem;
+    border-bottom: 1px solid var(--fog-border, #e5e7eb);
+  }
+
+  :global(.dark) .modal-header {
+    border-bottom-color: var(--fog-dark-border, #374151);
+  }
+
+  .modal-header h2 {
+    margin: 0;
+    font-size: 1.25rem;
+    font-weight: 600;
+    color: var(--fog-text, #1f2937);
+  }
+
+  :global(.dark) .modal-header h2 {
+    color: var(--fog-dark-text, #f9fafb);
+  }
+
+  .modal-body {
+    flex: 1;
+    overflow: auto;
+    padding: 1.5rem;
+  }
+
+  .modal-footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: 0.75rem;
+    padding: 1rem 1.5rem;
+    border-top: 1px solid var(--fog-border, #e5e7eb);
+  }
+
+  :global(.dark) .modal-footer {
+    border-top-color: var(--fog-dark-border, #374151);
+  }
+
+  .modal-footer button {
+    padding: 0.625rem 1.25rem;
+    border-radius: 0.375rem;
+    font-size: 0.875rem;
+    font-weight: 500;
+    cursor: pointer;
+    transition: all 0.2s;
+    border: 1px solid var(--fog-border, #e5e7eb);
+    background: var(--fog-highlight, #f3f4f6);
+    color: var(--fog-text, #475569);
+  }
+
+  .modal-footer button:hover {
+    background: var(--fog-border, #e5e7eb);
+  }
+
+  :global(.dark) .modal-footer button {
+    background: var(--fog-dark-highlight, #374151);
+    border-color: var(--fog-dark-border, #475569);
+    color: var(--fog-dark-text, #cbd5e1);
+  }
+
+  :global(.dark) .modal-footer button:hover {
+    background: var(--fog-dark-border, #475569);
+  }
+
+  .json-preview {
+    background: var(--fog-highlight, #f3f4f6);
+    padding: 1rem;
+    border-radius: 0.25rem;
+    overflow: auto;
+    font-family: 'SF Mono', Monaco, Inconsolata, 'Fira Code', 'Droid Sans Mono', 'Source Code Pro', monospace;
+    font-size: 0.875rem;
+    line-height: 1.6;
+    color: var(--fog-text, #1f2937);
+    max-height: 60vh;
+  }
+
+  :global(.dark) .json-preview {
+    background: var(--fog-dark-highlight, #374151);
+    color: var(--fog-dark-text, #f9fafb);
+  }
+
+  .preview-modal {
+    max-width: 800px;
+  }
+
+  .preview-body {
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+
+  .text-muted {
+    color: var(--fog-text-light, #6b7280);
+    font-style: italic;
+  }
+
+  :global(.dark) .text-muted {
+    color: var(--fog-dark-text-light, #9ca3af);
+  }
+
   .editor-footer {
     display: flex;
     justify-content: flex-end;
@@ -359,9 +1503,30 @@
       font-size: 1.125rem;
     }
 
+    .editor-toolbar {
+      padding: 0.5rem 1rem;
+      gap: 0.375rem;
+      min-height: 3rem;
+    }
+
+    .toolbar-group {
+      gap: 0.125rem;
+    }
+
+    .toolbar-button {
+      padding: 0.25rem 0.5rem;
+      font-size: 0.75rem;
+      min-width: 2rem;
+    }
+
+    .toolbar-separator {
+      height: 1.25rem;
+      margin: 0 0.125rem;
+    }
+
     .editor-wrapper {
       margin: 0.75rem 1rem;
-      min-height: calc(100vh - 200px);
+      min-height: calc(100vh - 250px);
     }
 
     .editor-footer {
@@ -375,4 +1540,22 @@
       padding: 0.75rem 1.25rem;
     }
   }
+
+  /* Very small screens */
+  @media (max-width: 480px) {
+    .editor-toolbar {
+      padding: 0.5rem 0.75rem;
+      gap: 0.25rem;
+    }
+
+    .toolbar-button {
+      padding: 0.25rem 0.375rem;
+      font-size: 0.7rem;
+      min-width: 1.75rem;
+    }
+
+    .toolbar-separator {
+      margin: 0 0.125rem;
+    }
+  }
 </style>
diff --git a/src/lib/components/write/CreateEventForm.svelte b/src/lib/components/write/CreateEventForm.svelte
index b44d641..419d52d 100644
--- a/src/lib/components/write/CreateEventForm.svelte
+++ b/src/lib/components/write/CreateEventForm.svelte
@@ -93,6 +93,8 @@
   let publicationResults = $state<{ success: string[]; failed: Array<{ relay: string; error: string }> } | null>(null);
   let showJsonModal = $state(false);
   let showPreviewModal = $state(false);
+  let previewContent = $state<string>('');
+  let previewEvent = $state<NostrEvent | null>(null);
   let showExampleModal = $state(false);
   let showAdvancedEditor = $state(false);
   let richTextEditorRef: { clearUploadedFiles: () => void; getUploadedFiles: () => Array<{ url: string; imetaTag: string[] }> } | null = $state(null);
@@ -228,12 +230,16 @@
       allTags.push(['client', 'aitherboard']);
     }
 
+    // Process content to add "nostr:" prefix to valid Nostr addresses
+    const { processNostrLinks } = await import('../../utils/nostr-link-processor.js');
+    const processedContent = processNostrLinks(contentWithUrls.trim());
+
     const event: Omit<NostrEvent, 'id' | 'sig'> = {
       kind: effectiveKind,
       pubkey: session.pubkey,
       created_at: Math.floor(Date.now() / 1000),
       tags: allTags,
-      content: contentWithUrls.trim()
+      content: processedContent
     };
 
     return JSON.stringify(event, null, 2);
@@ -527,7 +533,66 @@
             </button>
             <button
               type="button"
-              onclick={() => showPreviewModal = true}
+              onclick={async () => {
+                // Generate preview content with all processing applied
+                let contentWithUrls = content.trim();
+                for (const file of uploadedFiles) {
+                  if (!contentWithUrls.includes(file.url)) {
+                    if (contentWithUrls && !contentWithUrls.endsWith('\n')) {
+                      contentWithUrls += '\n';
+                    }
+                    contentWithUrls += `${file.url}\n`;
+                  }
+                }
+                
+                // Process content to add "nostr:" prefix
+                const { processNostrLinks } = await import('../../utils/nostr-link-processor.js');
+                previewContent = processNostrLinks(contentWithUrls.trim());
+                
+                // Build preview event with all tags
+                const previewTags: string[][] = [];
+                for (const tag of tags) {
+                  if (tag[0] && tag[1]) {
+                    previewTags.push([...tag]);
+                  }
+                }
+                for (const file of uploadedFiles) {
+                  previewTags.push(file.imetaTag);
+                }
+                
+                // Auto-extract tags
+                const autoTagsResult = await autoExtractTags({
+                  content: contentWithUrls,
+                  existingTags: previewTags,
+                  kind: effectiveKind
+                });
+                previewTags.push(...autoTagsResult.tags);
+                
+                // For parameterized replaceable events, ensure d-tag exists
+                if (isParameterizedReplaceableKind(effectiveKind)) {
+                  const dTagResult = ensureDTagForParameterizedReplaceable(previewTags, effectiveKind);
+                  if (dTagResult) {
+                    previewTags.push(['d', dTagResult.dTag]);
+                  }
+                }
+                
+                // Include client tag if selected
+                if (shouldIncludeClientTag()) {
+                  previewTags.push(['client', 'aitherboard']);
+                }
+                
+                previewEvent = {
+                  kind: effectiveKind,
+                  pubkey: sessionManager.getCurrentPubkey() || '',
+                  created_at: Math.floor(Date.now() / 1000),
+                  tags: previewTags,
+                  content: previewContent,
+                  id: '',
+                  sig: ''
+                } as NostrEvent;
+                
+                showPreviewModal = true;
+              }}
               class="content-button"
               disabled={publishing}
               title="Preview"
@@ -674,56 +739,49 @@
           <button onclick={() => showPreviewModal = false} class="close-button">×</button>
         </div>
         <div class="modal-body preview-body">
-          {#if content.trim() || uploadedFiles.length > 0}
-            {@const previewContent = (() => {
-              let contentWithUrls = content.trim();
-              for (const file of uploadedFiles) {
-                // Add URL to content field only if it's not already there
-                // (to avoid duplicates if URL was already inserted into textarea)
-                if (!contentWithUrls.includes(file.url)) {
-                  if (contentWithUrls && !contentWithUrls.endsWith('\n')) {
-                    contentWithUrls += '\n';
-                  }
-                  contentWithUrls += `${file.url}\n`;
-                }
-              }
-              return contentWithUrls.trim();
-            })()}
-            {@const previewEvent = (() => {
-              // Create a mock event for MediaAttachments to process
-              // MediaAttachments will skip imeta tags if URL is already in content
-              const previewTags: string[][] = [];
-              
-              // Include existing tags (like image tags, etc.)
-              for (const tag of tags) {
-                if (tag[0] && tag[1]) {
-                  previewTags.push([...tag]);
-                }
-              }
-              
-              // Add imeta tags from uploaded files
-              for (const file of uploadedFiles) {
-                previewTags.push(file.imetaTag);
-              }
-              
-              // For parameterized replaceable events, ensure d-tag exists
-              if (isParameterizedReplaceableKind(effectiveKind)) {
-                const dTagResult = ensureDTagForParameterizedReplaceable(previewTags, effectiveKind);
-                if (dTagResult) {
-                  previewTags.push(['d', dTagResult.dTag]);
-                }
-              }
-              
-              return {
-                kind: effectiveKind,
-                pubkey: sessionManager.getCurrentPubkey() || '',
-                created_at: Math.floor(Date.now() / 1000),
-                tags: previewTags,
-                content: previewContent,
-                id: '',
-                sig: ''
-              } as NostrEvent;
-            })()}
+          {#if previewEvent && previewContent}
+            <!-- Essential Metadata Display -->
+            {@const titleTag = previewEvent.tags.find(t => (t[0] === 'title' || t[0] === 'T') && t[1])}
+            {@const authorTag = previewEvent.tags.find(t => t[0] === 'author' && t[1])}
+            {@const summaryTag = previewEvent.tags.find(t => t[0] === 'summary' && t[1])}
+            {@const descriptionTag = previewEvent.tags.find(t => t[0] === 'description' && t[1])}
+            {@const imageTag = previewEvent.tags.find(t => t[0] === 'image' && t[1])}
+            
+            {#if titleTag || authorTag || summaryTag || descriptionTag || imageTag}
+              <div class="preview-metadata">
+                {#if titleTag}
+                  <div class="metadata-item">
+                    <strong class="metadata-label">Title:</strong>
+                    <span class="metadata-value">{titleTag[1]}</span>
+                  </div>
+                {/if}
+                {#if authorTag}
+                  <div class="metadata-item">
+                    <strong class="metadata-label">Author:</strong>
+                    <span class="metadata-value">{authorTag[1]}</span>
+                  </div>
+                {/if}
+                {#if summaryTag}
+                  <div class="metadata-item">
+                    <strong class="metadata-label">Summary:</strong>
+                    <span class="metadata-value">{summaryTag[1]}</span>
+                  </div>
+                {/if}
+                {#if descriptionTag}
+                  <div class="metadata-item">
+                    <strong class="metadata-label">Description:</strong>
+                    <span class="metadata-value">{descriptionTag[1]}</span>
+                  </div>
+                {/if}
+                {#if imageTag}
+                  <div class="metadata-item">
+                    <strong class="metadata-label">Image:</strong>
+                    <img src={imageTag[1]} alt="" class="preview-image" onerror={(e) => { (e.target as HTMLImageElement).style.display = 'none'; }} />
+                  </div>
+                {/if}
+              </div>
+            {/if}
+            
             {#if isParameterizedReplaceableKind(effectiveKind)}
               {@const dTag = previewEvent.tags.find(t => t[0] === 'd' && t[1])}
               {#if dTag}
@@ -734,6 +792,8 @@
             {/if}
             <MediaAttachments event={previewEvent} />
             <MarkdownRenderer content={previewContent} event={previewEvent} />
+          {:else if content.trim() || uploadedFiles.length > 0}
+            <p class="text-muted">Loading preview...</p>
           {:else}
             <p class="text-muted">No content to preview</p>
           {/if}
@@ -1434,6 +1494,55 @@
     padding: 1.5rem;
   }
 
+  .preview-metadata {
+    padding: 1rem;
+    background: var(--fog-highlight, #f1f5f9);
+    border: 1px solid var(--fog-border, #cbd5e1);
+    border-radius: 0.375rem;
+    margin-bottom: 1rem;
+  }
+
+  :global(.dark) .preview-metadata {
+    background: var(--fog-dark-highlight, #1e293b);
+    border-color: var(--fog-dark-border, #475569);
+  }
+
+  .metadata-item {
+    margin-bottom: 0.75rem;
+  }
+
+  .metadata-item:last-child {
+    margin-bottom: 0;
+  }
+
+  .metadata-label {
+    display: inline-block;
+    min-width: 100px;
+    color: var(--fog-text, #475569);
+    font-weight: 500;
+    margin-right: 0.5rem;
+  }
+
+  :global(.dark) .metadata-label {
+    color: var(--fog-dark-text, #cbd5e1);
+  }
+
+  .metadata-value {
+    color: var(--fog-text, #1f2937);
+  }
+
+  :global(.dark) .metadata-value {
+    color: var(--fog-dark-text, #f9fafb);
+  }
+
+  .preview-image {
+    max-width: 100%;
+    max-height: 300px;
+    border-radius: 0.375rem;
+    margin-top: 0.5rem;
+    display: block;
+  }
+
   .d-tag-preview {
     padding: 0.75rem;
     background: #f1f5f9;
diff --git a/src/lib/modules/comments/CommentForm.svelte b/src/lib/modules/comments/CommentForm.svelte
index b7bca1b..21edebd 100644
--- a/src/lib/modules/comments/CommentForm.svelte
+++ b/src/lib/modules/comments/CommentForm.svelte
@@ -74,6 +74,8 @@
   let publicationResults: { success: string[]; failed: Array<{ relay: string; error: string }> } | null = $state(null);
   let showJsonModal = $state(false);
   let showPreviewModal = $state(false);
+  let previewContent = $state<string>('');
+  let previewEvent = $state<NostrEvent | null>(null);
   let richTextEditorRef: { clearUploadedFiles: () => void; getUploadedFiles: () => Array<{ url: string; imetaTag: string[] }> } | null = $state(null);
   let uploadedFiles: Array<{ url: string; imetaTag: string[] }> = $state([]);
   let eventJson = $state('{}');
@@ -288,6 +290,7 @@
     const replyKind = getReplyKind();
     const tags: string[][] = [];
     
+    // Add threading tags
     if (replyKind === 1) {
       tags.push(['e', threadId]);
       if (rootEvent) {
@@ -390,7 +393,49 @@
       </button>
       <button
         type="button"
-        onclick={() => showPreviewModal = true}
+        onclick={async () => {
+          // Generate preview content with all processing applied
+          let contentWithUrls = content.trim();
+          for (const file of uploadedFiles) {
+            if (!contentWithUrls.includes(file.url)) {
+              if (contentWithUrls && !contentWithUrls.endsWith('\n')) {
+                contentWithUrls += '\n';
+              }
+              contentWithUrls += `${file.url}\n`;
+            }
+          }
+          
+          // Process content to add "nostr:" prefix
+          const { processNostrLinks } = await import('../../utils/nostr-link-processor.js');
+          previewContent = processNostrLinks(contentWithUrls.trim());
+          
+          // Build preview event with all tags
+          const previewTags: string[][] = [];
+          for (const file of uploadedFiles) {
+            previewTags.push(file.imetaTag);
+          }
+          
+          // Auto-extract tags
+          const replyKind = getReplyKind();
+          const autoTagsResult = await autoExtractTags({
+            content: contentWithUrls,
+            existingTags: previewTags,
+            kind: replyKind
+          });
+          previewTags.push(...autoTagsResult.tags);
+          
+          previewEvent = {
+            kind: replyKind,
+            pubkey: sessionManager.getCurrentPubkey() || '',
+            created_at: Math.floor(Date.now() / 1000),
+            tags: previewTags,
+            content: previewContent,
+            id: '',
+            sig: ''
+          } as NostrEvent;
+          
+          showPreviewModal = true;
+        }}
         class="px-3 py-2 text-sm border border-fog-border dark:border-fog-dark-border rounded hover:bg-fog-highlight dark:hover:bg-fog-dark-highlight disabled:opacity-50"
         disabled={publishing}
         title="Preview"
@@ -494,40 +539,11 @@
           <button onclick={() => showPreviewModal = false} class="close-button">×</button>
         </div>
         <div class="modal-body preview-body">
-          {#if content.trim() || uploadedFiles.length > 0}
-            {@const previewContent = (() => {
-              let contentWithUrls = content.trim();
-              for (const file of uploadedFiles) {
-                // Add URL to content field only if it's not already there
-                // (to avoid duplicates if URL was already inserted into textarea)
-                if (!contentWithUrls.includes(file.url)) {
-                  if (contentWithUrls && !contentWithUrls.endsWith('\n')) {
-                    contentWithUrls += '\n';
-                  }
-                  contentWithUrls += `${file.url}\n`;
-                }
-              }
-              return contentWithUrls.trim();
-            })()}
-            {@const previewEvent = (() => {
-              // Create a mock event for MediaAttachments to process
-              // MediaAttachments will skip imeta tags if URL is already in content
-              const tags: string[][] = [];
-              for (const file of uploadedFiles) {
-                tags.push(file.imetaTag);
-              }
-              return {
-                kind: getReplyKind(),
-                pubkey: sessionManager.getCurrentPubkey() || '',
-                created_at: Math.floor(Date.now() / 1000),
-                tags,
-                content: previewContent,
-                id: '',
-                sig: ''
-              } as NostrEvent;
-            })()}
+          {#if previewEvent && previewContent}
             <MediaAttachments event={previewEvent} />
             <MarkdownRenderer content={previewContent} event={previewEvent} />
+          {:else if content.trim() || uploadedFiles.length > 0}
+            <p class="text-muted">Loading preview...</p>
           {:else}
             <p class="text-muted">No content to preview</p>
           {/if}