diff --git a/package-lock.json b/package-lock.json
index af05a2f..b492bff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "jumble-imwald",
-  "version": "13.5",
+  "version": "13.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jumble-imwald",
-      "version": "13.5",
+      "version": "13.6",
       "license": "MIT",
       "dependencies": {
         "@asciidoctor/core": "^3.0.4",
diff --git a/package.json b/package.json
index da09845..2228cb7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jumble-imwald",
-  "version": "13.5",
+  "version": "13.6",
   "description": "A user-friendly Nostr client focused on relay feed browsing and relay discovery, forked from Jumble",
   "private": true,
   "type": "module",
diff --git a/src/components/PostEditor/PostContent.tsx b/src/components/PostEditor/PostContent.tsx
index f691537..1a39cb6 100644
--- a/src/components/PostEditor/PostContent.tsx
+++ b/src/components/PostEditor/PostContent.tsx
@@ -286,10 +286,13 @@ export default function PostContent({
             quietDays
           })
         } else {
+          // For regular kind 1 note OPs (no parentEvent), never use protectedEvent
+          // protectedEvent should only be used for public messages and discussions
+          const shouldUseProtectedEvent = parentEvent ? isProtectedEvent : false
           draftEvent = await createShortTextNoteDraftEvent(cleanedText, mentions, {
             parentEvent,
             addClientTag,
-            protectedEvent: isProtectedEvent,
+            protectedEvent: shouldUseProtectedEvent,
             isNsfw,
             addExpirationTag,
             expirationMonths,
diff --git a/src/components/PostEditor/PostTextarea/Preview.tsx b/src/components/PostEditor/PostTextarea/Preview.tsx
index 4721c17..a636488 100644
--- a/src/components/PostEditor/PostTextarea/Preview.tsx
+++ b/src/components/PostEditor/PostTextarea/Preview.tsx
@@ -11,6 +11,7 @@ import { useMemo } from 'react'
 import ContentPreview from '../../ContentPreview'
 import Content from '../../Content'
 import Highlight from '../../Note/Highlight'
+import MarkdownArticle from '../../Note/MarkdownArticle/MarkdownArticle'
 import { HighlightData } from '../HighlightEditor'
 
 export default function Preview({ 
@@ -138,7 +139,21 @@ export default function Preview({
       </Card>
     )
   }
-  
+
+  // For kind 1 notes, use MarkdownArticle to match actual rendering
+  // This ensures preview matches the final result (no Links section, correct image placement, proper line breaks)
+  if (kind === kinds.ShortTextNote || kind === ExtendedKind.COMMENT || kind === ExtendedKind.VOICE_COMMENT) {
+    return (
+      <Card className={cn('p-3', className)}>
+        <MarkdownArticle
+          event={fakeEvent}
+          className="pointer-events-none"
+          hideMetadata={true}
+        />
+      </Card>
+    )
+  }
+
   return (
     <Card className={cn('p-3', className)}>
       <Content