diff --git a/src/components/Note/Highlight.tsx b/src/components/Note/Highlight.tsx
index 80cd93f2..bc2a9706 100644
--- a/src/components/Note/Highlight.tsx
+++ b/src/components/Note/Highlight.tsx
@@ -102,7 +102,7 @@ function HighlightSource({ event }: { event: Event }) {
 
   return (
     <div className="flex items-center gap-2 text-muted-foreground">
-      <div>{t('From')}</div>
+      <div className="shrink-0">{t('From')}</div>
       {pubkey && <UserAvatar userId={pubkey} size="xSmall" className="cursor-pointer" />}
       {referenceEvent && isSupportedKind(referenceEvent.kind) ? (
         <ContentPreview
diff --git a/src/components/PostEditor/PostTextarea/index.tsx b/src/components/PostEditor/PostTextarea/index.tsx
index 33319e72..c736754d 100644
--- a/src/components/PostEditor/PostTextarea/index.tsx
+++ b/src/components/PostEditor/PostTextarea/index.tsx
@@ -108,7 +108,7 @@ const PostTextarea = forwardRef<
   }
 
   return (
-    <Tabs defaultValue="edit" className="space-y-4">
+    <Tabs defaultValue="edit" className="space-y-2">
       <TabsList>
         <TabsTrigger value="edit">{t('Edit')}</TabsTrigger>
         <TabsTrigger value="preview">{t('Preview')}</TabsTrigger>
diff --git a/src/components/ReplyNoteList/index.tsx b/src/components/ReplyNoteList/index.tsx
index 16022778..0ba09c8a 100644
--- a/src/components/ReplyNoteList/index.tsx
+++ b/src/components/ReplyNoteList/index.tsx
@@ -251,7 +251,14 @@ export default function ReplyNoteList({
       <div className={className}>
         {replies.slice(0, showCount).map((reply) => {
           if (!isUserTrusted(reply.pubkey)) {
-            return null
+            const repliesForThisReply = repliesMap.get(reply.id)
+            // If the reply is not trusted and there are no trusted replies for this reply, skip rendering
+            if (
+              !repliesForThisReply ||
+              repliesForThisReply.events.every((evt) => !isUserTrusted(evt.pubkey))
+            ) {
+              return null
+            }
           }
 
           const parentEventTag = getParentEventTag(reply)