diff --git a/src/components/NoteStats/LikeButton.tsx b/src/components/NoteStats/LikeButton.tsx
index 0b8798fd..3947761d 100644
--- a/src/components/NoteStats/LikeButton.tsx
+++ b/src/components/NoteStats/LikeButton.tsx
@@ -11,11 +11,9 @@ import { formatCount } from './utils'
 
 export default function LikeButton({
   event,
-  variant = 'normal',
   canFetch = false
 }: {
   event: Event
-  variant?: 'normal' | 'reply'
   canFetch?: boolean
 }) {
   const { t } = useTranslation()
@@ -70,8 +68,7 @@ export default function LikeButton({
   return (
     <button
       className={cn(
-        'flex items-center enabled:hover:text-red-400',
-        variant === 'normal' ? 'gap-1' : 'flex-col',
+        'flex items-center enabled:hover:text-red-400 gap-1',
         hasLiked ? 'text-red-400' : 'text-muted-foreground'
       )}
       onClick={like}
diff --git a/src/components/NoteStats/ReplyButton.tsx b/src/components/NoteStats/ReplyButton.tsx
index ed6a6584..1d0a426e 100644
--- a/src/components/NoteStats/ReplyButton.tsx
+++ b/src/components/NoteStats/ReplyButton.tsx
@@ -7,11 +7,20 @@ import { useTranslation } from 'react-i18next'
 import PostEditor from '../PostEditor'
 import { formatCount } from './utils'
 
-export default function ReplyButton({ event }: { event: Event }) {
+export default function ReplyButton({
+  event,
+  variant = 'note'
+}: {
+  event: Event
+  variant?: 'note' | 'reply'
+}) {
   const { t } = useTranslation()
   const { checkLogin } = useNostr()
   const { noteStatsMap } = useNoteStats()
-  const { replyCount } = useMemo(() => noteStatsMap.get(event.id) ?? {}, [noteStatsMap, event.id])
+  const { replyCount } = useMemo(
+    () => (variant === 'reply' ? {} : (noteStatsMap.get(event.id) ?? {})),
+    [noteStatsMap, event.id, variant]
+  )
   const [open, setOpen] = useState(false)
 
   return (
@@ -27,7 +36,9 @@ export default function ReplyButton({ event }: { event: Event }) {
         title={t('Reply')}
       >
         <MessageCircle size={16} />
-        {!!replyCount && <div className="text-sm">{formatCount(replyCount)}</div>}
+        {variant !== 'reply' && !!replyCount && (
+          <div className="text-sm">{formatCount(replyCount)}</div>
+        )}
       </button>
       <PostEditor parentEvent={event} open={open} setOpen={setOpen} />
     </>
diff --git a/src/components/NoteStats/index.tsx b/src/components/NoteStats/index.tsx
index 09ed561f..3bab1d6e 100644
--- a/src/components/NoteStats/index.tsx
+++ b/src/components/NoteStats/index.tsx
@@ -8,16 +8,18 @@ import RepostButton from './RepostButton'
 export default function NoteStats({
   event,
   className,
-  fetchIfNotExisting = false
+  fetchIfNotExisting = false,
+  variant = 'note'
 }: {
   event: Event
   className?: string
   fetchIfNotExisting?: boolean
+  variant?: 'note' | 'reply'
 }) {
   return (
     <div className={cn('flex justify-between', className)}>
-      <div className="flex gap-4 h-4 items-center" onClick={(e) => e.stopPropagation()}>
-        <ReplyButton event={event} />
+      <div className="flex gap-5 h-4 items-center" onClick={(e) => e.stopPropagation()}>
+        <ReplyButton event={event} variant={variant} />
         <RepostButton event={event} canFetch={fetchIfNotExisting} />
         <LikeButton event={event} canFetch={fetchIfNotExisting} />
       </div>
diff --git a/src/components/ReplyNote/index.tsx b/src/components/ReplyNote/index.tsx
index 5a3c6cf7..9f34ebdd 100644
--- a/src/components/ReplyNote/index.tsx
+++ b/src/components/ReplyNote/index.tsx
@@ -1,14 +1,8 @@
-import { useSecondaryPage } from '@/PageManager'
-import { toNote } from '@/lib/link'
-import { useNostr } from '@/providers/NostrProvider'
 import { Event } from 'nostr-tools'
-import { useState } from 'react'
-import { useTranslation } from 'react-i18next'
 import Content from '../Content'
 import { FormattedTimestamp } from '../FormattedTimestamp'
-import LikeButton from '../NoteStats/LikeButton'
+import NoteStats from '../NoteStats'
 import ParentNotePreview from '../ParentNotePreview'
-import PostEditor from '../PostEditor'
 import UserAvatar from '../UserAvatar'
 import Username from '../Username'
 
@@ -23,25 +17,25 @@ export default function ReplyNote({
   onClickParent?: (eventId: string) => void
   highlight?: boolean
 }) {
-  const { t } = useTranslation()
-  const { checkLogin } = useNostr()
-  const { push } = useSecondaryPage()
-  const [isPostDialogOpen, setIsPostDialogOpen] = useState(false)
-
   return (
     <div
-      className={`flex space-x-2 items-start rounded-lg p-2 transition-colors duration-500 clickable ${highlight ? 'bg-highlight/50' : ''}`}
-      onClick={() => push(toNote(event.id))}
+      className={`flex space-x-2 items-start rounded-lg p-2 transition-colors duration-500 ${highlight ? 'bg-highlight/50' : ''}`}
     >
       <UserAvatar userId={event.pubkey} size="small" className="shrink-0" />
-      <div className="w-full overflow-hidden space-y-1">
-        <Username
-          userId={event.pubkey}
-          className="text-sm font-semibold text-muted-foreground hover:text-foreground truncate"
-          skeletonClassName="h-3"
-        />
+      <div className="w-full overflow-hidden">
+        <div className="flex gap-2 items-center">
+          <Username
+            userId={event.pubkey}
+            className="text-sm font-semibold text-muted-foreground hover:text-foreground truncate"
+            skeletonClassName="h-3"
+          />
+          <div className="text-xs text-muted-foreground">
+            <FormattedTimestamp timestamp={event.created_at} />
+          </div>
+        </div>
         {parentEvent && (
           <ParentNotePreview
+            className="mt-1"
             event={parentEvent}
             onClick={(e) => {
               e.stopPropagation()
@@ -49,24 +43,9 @@ export default function ReplyNote({
             }}
           />
         )}
-        <Content event={event} size="small" />
-        <div className="flex gap-2 text-xs">
-          <div className="text-muted-foreground/60">
-            <FormattedTimestamp timestamp={event.created_at} />
-          </div>
-          <div
-            className="text-muted-foreground hover:text-primary cursor-pointer"
-            onClick={(e) => {
-              e.stopPropagation()
-              checkLogin(() => setIsPostDialogOpen(true))
-            }}
-          >
-            {t('reply')}
-          </div>
-        </div>
+        <Content className="mt-1" event={event} size="small" />
+        <NoteStats className="mt-2" event={event} variant="reply" />
       </div>
-      <LikeButton event={event} variant="reply" />
-      <PostEditor parentEvent={event} open={isPostDialogOpen} setOpen={setIsPostDialogOpen} />
     </div>
   )
 }