diff --git a/app/lish/[did]/[publication]/[rkey]/Blocks/PublishBskyPostBlock.tsx b/app/lish/[did]/[publication]/[rkey]/Blocks/PublishBskyPostBlock.tsx
index 44c41a60..3343af46 100644
--- a/app/lish/[did]/[publication]/[rkey]/Blocks/PublishBskyPostBlock.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/Blocks/PublishBskyPostBlock.tsx
@@ -113,7 +113,7 @@ export const PubBlueskyPostBlock = (props: {
               {post.replyCount != null && post.replyCount > 0 && (
                 <>
                   <ThreadLink
-                    threadUri={post.uri}
+                    postUri={post.uri}
                     parent={parent}
                     className="flex items-center gap-1 hover:text-accent-contrast"
                     onClick={(e) => e.stopPropagation()}
diff --git a/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx b/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx
index 014664e5..1cfe3139 100644
--- a/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx
@@ -87,17 +87,13 @@ function QuotePost(props: { post: PostView; quotesUri: string }) {
   const parent = { type: "quotes" as const, uri: quotesUri };
 
   return (
-    <div
-      className="flex gap-2 relative py-2 px-2 hover:bg-bg-page rounded cursor-pointer"
-      onClick={() => openPage(parent, { type: "thread", uri: post.uri })}
-    >
-      <BskyPostContent
-        post={post}
-        parent={parent}
-        showEmbed={true}
-        showBlueskyLink={true}
-        onEmbedClick={(e) => e.stopPropagation()}
-      />
-    </div>
+    <BskyPostContent
+      post={post}
+      parent={parent}
+      showEmbed={true}
+      showBlueskyLink={true}
+      onEmbedClick={(e) => e.stopPropagation()}
+      className="relative py-2 px-2 hover:bg-bg-page rounded cursor-pointer"
+    />
   );
 }
diff --git a/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx b/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx
index cb1e5d0b..e9512897 100644
--- a/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx
@@ -8,7 +8,7 @@ import { QuoteTiny } from "components/Icons/QuoteTiny";
 import { Separator } from "components/Layout";
 import { useLocalizedDate } from "src/hooks/useLocalizedDate";
 import { useHasPageLoaded } from "components/InitialPageLoadProvider";
-import { OpenPage } from "./PostPages";
+import { OpenPage, openPage } from "./PostPages";
 import { ThreadLink, QuotesLink } from "./PostLinks";
 import { BlueskyLinkTiny } from "components/Icons/BlueskyLinkTiny";
 import { Avatar } from "components/Avatar";
@@ -25,8 +25,12 @@ export function BskyPostContent(props: {
   showEmbed?: boolean;
   showBlueskyLink?: boolean;
   onEmbedClick?: (e: React.MouseEvent) => void;
-  quoteCountOnClick?: (e: React.MouseEvent) => void;
-  replyCountOnClick?: (e: React.MouseEvent) => void;
+  quoteEnabled?: boolean;
+  replyEnabled?: boolean;
+  replyOnClick?: (e: React.MouseEvent) => void;
+  replyLine?: {
+    onToggle: (e: React.MouseEvent) => void;
+  };
 }) {
   const {
     post,
@@ -35,8 +39,10 @@ export function BskyPostContent(props: {
     showEmbed = true,
     showBlueskyLink = true,
     onEmbedClick,
-    quoteCountOnClick,
-    replyCountOnClick,
+    quoteEnabled,
+    replyEnabled,
+    replyOnClick,
+    replyLine,
   } = props;
 
   const record = post.record as AppBskyFeedPost.Record;
@@ -44,126 +50,153 @@ export function BskyPostContent(props: {
   const url = `https://bsky.app/profile/${post.author.handle}/post/${postId}`;
 
   return (
-    <>
-      <Avatar
-        src={post.author.avatar}
-        displayName={post.author.displayName}
-        size={props.avatarSize ? props.avatarSize : "medium"}
-      />
-
-      <div className={`flex flex-col grow min-w-0 ${props.className}`}>
-        <div
-          className={`flex justify-between items-center gap-2 leading-tight `}
-        >
-          <div className="flex gap-2 items-center">
-            <div className="font-bold text-secondary">
-              {post.author.displayName}
-            </div>
-            <ProfilePopover
-              trigger={
-                <div className="text-sm text-tertiary hover:underline">
-                  @{post.author.handle}
-                </div>
-              }
-              didOrHandle={post.author.handle}
-            />
-          </div>
-          <div className="text-sm text-tertiary">
-            {timeAgo(record.createdAt, { compact: true })}
-          </div>
+    <div className="bskyPost relative flex flex-col">
+      {replyLine && (
+        <div className="replyLine absolute top-0 bottom-0 shrink-0 w-6 bg-test">
+          <button
+            onClick={(e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              replyLine.onToggle(e);
+              console.log("clicked");
+            }}
+            className="w-full h-full flex justify-center"
+            aria-label="Toggle replies"
+          >
+            <div className="w-0.5 h-full bg-border-light" />
+          </button>
         </div>
+      )}
+      <button
+        className={`flex gap-2 text-left ${props.className}`}
+        onClick={() => {
+          openPage(parent, { type: "thread", uri: post.uri });
+          console.log("do this");
+        }}
+      >
+        <Avatar
+          src={post.author.avatar}
+          displayName={post.author.displayName}
+          size={props.avatarSize ? props.avatarSize : "medium"}
+        />
 
-        <div
-          className={`flex flex-col gap-2 ${avatarSize === "large" ? "mt-0.5" : "mt-1"}`}
-        >
-          <div className="text-sm text-secondary">
-            <BlueskyRichText record={record} />
-          </div>
-          {showEmbed && post.embed && (
-            <div onClick={onEmbedClick}>
-              <BlueskyEmbed
-                embed={post.embed}
-                postUrl={url}
-                className="text-sm"
+        <div className={`bskyPostTextContent flex flex-col grow min-w-0 mt-1 `}>
+          <div
+            className={`flex justify-between items-center gap-2 leading-tight `}
+          >
+            <div className="flex gap-2 items-center">
+              <div className="font-bold text-secondary">
+                {post.author.displayName}
+              </div>
+              <ProfilePopover
+                trigger={
+                  <div className="text-sm text-tertiary hover:underline">
+                    @{post.author.handle}
+                  </div>
+                }
+                didOrHandle={post.author.handle}
               />
             </div>
-          )}
-        </div>
+            <div className="text-sm text-tertiary">
+              {timeAgo(record.createdAt, { compact: true })}
+            </div>
+          </div>
 
-        <div className={`flex gap-2 items-center justify-between mt-2`}>
-          <PostCounts
-            post={post}
-            parent={parent}
-            replyCountOnClick={replyCountOnClick}
-            quoteCountOnClick={quoteCountOnClick}
-            showBlueskyLink={showBlueskyLink}
-            url={url}
-          />
-          <div className="flex gap-3 items-center">
-            {showBlueskyLink && (
-              <>
-                <a className="text-tertiary" target="_blank" href={url}>
-                  <BlueskyLinkTiny />
-                </a>
-              </>
+          <div
+            className={`flex flex-col gap-2 ${avatarSize === "large" ? "mt-0.5" : "mt-1"}`}
+          >
+            <div className="text-sm text-secondary">
+              <BlueskyRichText record={record} />
+            </div>
+            {showEmbed && post.embed && (
+              <div onClick={onEmbedClick}>
+                <BlueskyEmbed
+                  embed={post.embed}
+                  postUrl={url}
+                  className="text-sm"
+                />
+              </div>
             )}
           </div>
+
+          <div className={`flex gap-2 items-center justify-between mt-2`}>
+            <PostCounts
+              post={post}
+              parent={parent}
+              replyEnabled={replyEnabled}
+              replyOnClick={replyOnClick}
+              quoteEnabled={quoteEnabled}
+              showBlueskyLink={showBlueskyLink}
+              url={url}
+            />
+            <div className="flex gap-3 items-center">
+              {showBlueskyLink && (
+                <>
+                  <a className="text-tertiary" target="_blank" href={url}>
+                    <BlueskyLinkTiny />
+                  </a>
+                </>
+              )}
+            </div>
+          </div>
         </div>
-      </div>
-    </>
+      </button>
+    </div>
   );
 }
 
 function PostCounts(props: {
   post: PostView;
   parent?: OpenPage;
-  quoteCountOnClick?: (e: React.MouseEvent) => void;
-  replyCountOnClick?: (e: React.MouseEvent) => void;
+  quoteEnabled?: boolean;
+  replyEnabled?: boolean;
+  replyOnClick?: (e: React.MouseEvent) => void;
   showBlueskyLink: boolean;
   url: string;
 }) {
+  const replyContent = props.post.replyCount != null &&
+    props.post.replyCount > 0 && (
+      <div className="postRepliesCount flex items-center gap-1 text-tertiary text-xs">
+        <CommentTiny />
+        {props.post.replyCount}
+      </div>
+    );
+
+  const quoteContent = props.post.quoteCount != null &&
+    props.post.quoteCount > 0 && (
+      <div className="postQuoteCount flex items-center gap-1 text-tertiary text-xs">
+        <QuoteTiny />
+        {props.post.quoteCount}
+      </div>
+    );
+
   return (
     <div className="postCounts flex gap-2 items-center">
-      {props.post.replyCount != null && props.post.replyCount > 0 && (
-        <>
-          {props.replyCountOnClick ? (
-            <ThreadLink
-              threadUri={props.post.uri}
-              parent={parent}
-              className="relative postRepliesLink flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast"
-              onClick={props.replyCountOnClick}
-            >
-              <CommentTiny />
-              {props.post.replyCount}
-            </ThreadLink>
-          ) : (
-            <div className="postRepliesCount flex items-center gap-1 text-tertiary text-xs">
-              <CommentTiny />
-              {props.post.replyCount}
-            </div>
-          )}
-        </>
-      )}
-      {props.post.quoteCount != null && props.post.quoteCount > 0 && (
-        <>
-          {props.quoteCountOnClick ? (
-            <QuotesLink
-              postUri={props.post.uri}
-              parent={parent}
-              className="relative flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast"
-              onClick={props.quoteCountOnClick}
-            >
-              <QuoteTiny />
-              {props.post.quoteCount}
-            </QuotesLink>
-          ) : (
-            <div className="postQuoteCount flex items-center gap-1 text-tertiary text-xs">
-              <QuoteTiny />
-              {props.post.quoteCount}
-            </div>
-          )}
-        </>
-      )}
+      {replyContent &&
+        (props.replyEnabled ? (
+          <ThreadLink
+            postUri={props.post.uri}
+            parent={props.parent}
+            className="relative postRepliesLink hover:text-accent-contrast"
+            onClick={props.replyOnClick}
+          >
+            {replyContent}
+          </ThreadLink>
+        ) : (
+          replyContent
+        ))}
+      {quoteContent &&
+        (props.quoteEnabled ? (
+          <QuotesLink
+            postUri={props.post.uri}
+            parent={props.parent}
+            className="relative hover:text-accent-contrast"
+          >
+            {quoteContent}
+          </QuotesLink>
+        ) : (
+          quoteContent
+        ))}
     </div>
   );
 }
diff --git a/app/lish/[did]/[publication]/[rkey]/Interactions/Quotes.tsx b/app/lish/[did]/[publication]/[rkey]/Interactions/Quotes.tsx
index 05c1d550..980b6149 100644
--- a/app/lish/[did]/[publication]/[rkey]/Interactions/Quotes.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/Interactions/Quotes.tsx
@@ -136,26 +136,15 @@ export const MentionsDrawerContent = (props: {
 
                   const parent = { type: "thread" as const, uri: q.uri };
                   return (
-                    <button
-                      className="flex gap-2 text-left"
-                      onClick={() => {
-                        openPage(undefined, { type: "thread", uri: q.uri });
-                      }}
-                    >
-                      <BskyPostContent
-                        key={`mention-${index}`}
-                        post={post}
-                        parent={parent}
-                        showBlueskyLink={true}
-                        showEmbed={true}
-                        avatarSize="large"
-                        quoteCountOnClick={(e) => {
-                          e.stopPropagation();
-                          e.preventDefault();
-                          openPage(undefined, { type: "quotes", uri: q.uri });
-                        }}
-                      />
-                    </button>
+                    <BskyPostContent
+                      key={`mention-${index}`}
+                      post={post}
+                      parent={parent}
+                      showBlueskyLink={true}
+                      showEmbed={true}
+                      avatarSize="large"
+                      quoteEnabled={true}
+                    />
                   );
                 })}
               </div>
diff --git a/app/lish/[did]/[publication]/[rkey]/PostLinks.tsx b/app/lish/[did]/[publication]/[rkey]/PostLinks.tsx
index 0800cbda..5762dea8 100644
--- a/app/lish/[did]/[publication]/[rkey]/PostLinks.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/PostLinks.tsx
@@ -55,22 +55,23 @@ export const prefetchQuotes = (uri: string) => {
 
 // Link component for opening thread pages with prefetching
 export function ThreadLink(props: {
-  threadUri: string;
+  postUri: string;
   parent?: OpenPage;
   children: React.ReactNode;
   className?: string;
   onClick?: (e: React.MouseEvent) => void;
 }) {
-  const { threadUri, parent, children, className, onClick } = props;
+  const { postUri, parent, children, className, onClick } = props;
 
   const handleClick = (e: React.MouseEvent) => {
+    e.stopPropagation();
     onClick?.(e);
     if (e.defaultPrevented) return;
-    openPage(parent, { type: "thread", uri: threadUri });
+    openPage(parent, { type: "thread", uri: postUri });
   };
 
   const handlePrefetch = () => {
-    prefetchThread(threadUri);
+    prefetchThread(postUri);
   };
 
   return (
@@ -96,6 +97,7 @@ export function QuotesLink(props: {
   const { postUri, parent, children, className, onClick } = props;
 
   const handleClick = (e: React.MouseEvent) => {
+    e.stopPropagation();
     onClick?.(e);
     if (e.defaultPrevented) return;
     openPage(parent, { type: "quotes", uri: postUri });
diff --git a/app/lish/[did]/[publication]/[rkey]/PostPages.tsx b/app/lish/[did]/[publication]/[rkey]/PostPages.tsx
index c2305d27..63b3637c 100644
--- a/app/lish/[did]/[publication]/[rkey]/PostPages.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/PostPages.tsx
@@ -297,7 +297,7 @@ export function PostPages({
             <Fragment key={pageKey}>
               <SandwichSpacer />
               <ThreadPageComponent
-                threadUri={openPage.uri}
+                parentUri={openPage.uri}
                 pageId={pageKey}
                 hasPageBackground={hasPageBackground}
                 pageOptions={
diff --git a/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx b/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx
index c75963a1..8efc880e 100644
--- a/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx
@@ -25,20 +25,20 @@ type BlockedPost = AppBskyFeedDefs.BlockedPost;
 type ThreadType = ThreadViewPost | NotFoundPost | BlockedPost;
 
 export function ThreadPage(props: {
-  threadUri: string;
+  parentUri: string;
   pageId: string;
   pageOptions?: React.ReactNode;
   hasPageBackground: boolean;
 }) {
-  const { threadUri, pageId, pageOptions } = props;
-  const drawer = useDrawerOpen(threadUri);
+  const { parentUri: parentUri, pageId, pageOptions } = props;
+  const drawer = useDrawerOpen(parentUri);
 
   const {
     data: thread,
     isLoading,
     error,
-  } = useSWR(threadUri ? getThreadKey(threadUri) : null, () =>
-    fetchThread(threadUri),
+  } = useSWR(parentUri ? getThreadKey(parentUri) : null, () =>
+    fetchThread(parentUri),
   );
 
   return (
@@ -60,15 +60,15 @@ export function ThreadPage(props: {
             Failed to load thread
           </div>
         ) : thread ? (
-          <ThreadContent thread={thread} threadUri={threadUri} />
+          <ThreadContent thread={thread} parentUri={parentUri} />
         ) : null}
       </div>
     </PageWrapper>
   );
 }
 
-function ThreadContent(props: { thread: ThreadType; threadUri: string }) {
-  const { thread, threadUri } = props;
+function ThreadContent(props: { thread: ThreadType; parentUri: string }) {
+  const { thread, parentUri: parentUri } = props;
   const mainPostRef = useRef<HTMLDivElement>(null);
 
   // Scroll the main post into view when the thread loads
@@ -114,7 +114,7 @@ function ThreadContent(props: { thread: ThreadType; threadUri: string }) {
             post={parent}
             isMainPost={false}
             showReplyLine={index < parents.length - 1 || true}
-            threadUri={threadUri}
+            parentUri={parentUri}
           />
         </div>
       ))}
@@ -125,7 +125,7 @@ function ThreadContent(props: { thread: ThreadType; threadUri: string }) {
           post={thread}
           isMainPost={true}
           showReplyLine={false}
-          threadUri={threadUri}
+          parentUri={parentUri}
         />
       </div>
 
@@ -134,7 +134,7 @@ function ThreadContent(props: { thread: ThreadType; threadUri: string }) {
         <div className="threadReplies flex flex-col mt-2 pt-2 border-t border-border-light">
           <Replies
             replies={thread.replies as any[]}
-            threadUri={threadUri}
+            parentUri={parentUri}
             depth={0}
             parentAuthorDid={thread.post.author.did}
           />
@@ -148,11 +148,11 @@ function ThreadPost(props: {
   post: ThreadViewPost;
   isMainPost: boolean;
   showReplyLine: boolean;
-  threadUri: string;
+  parentUri: string;
 }) {
-  const { post, isMainPost, showReplyLine, threadUri } = props;
+  const { post, isMainPost, showReplyLine, parentUri } = props;
   const postView = post.post;
-  const parent = { type: "thread" as const, uri: threadUri };
+  const parent = { type: "thread" as const, uri: parentUri };
 
   return (
     <div className="threadPost flex gap-2 relative">
@@ -165,15 +165,8 @@ function ThreadPost(props: {
         parent={parent}
         showBlueskyLink={true}
         showEmbed={true}
-        quoteCountOnClick={(e) => {
-          e.stopPropagation();
-          e.preventDefault();
-          openPage(parent, { type: "quotes", uri: postView.uri });
-        }}
-        replyCountOnClick={(e) => {
-          e.stopPropagation();
-          e.preventDefault();
-        }}
+        quoteEnabled
+        replyEnabled
       />
     </div>
   );
@@ -181,12 +174,11 @@ function ThreadPost(props: {
 
 function Replies(props: {
   replies: (ThreadViewPost | NotFoundPost | BlockedPost)[];
-  threadUri: string;
   depth: number;
   parentAuthorDid?: string;
-  parentUri?: string;
+  parentUri: string;
 }) {
-  const { replies, threadUri, depth, parentAuthorDid, parentUri } = props;
+  const { replies, depth, parentAuthorDid, parentUri } = props;
   const collapsedThreads = useThreadState((s) => s.collapsedThreads);
   const toggleCollapsed = useThreadState((s) => s.toggleCollapsed);
 
@@ -241,13 +233,8 @@ function Replies(props: {
           <ReplyPost
             post={reply}
             isLast={index === replies.length - 1 && !hasReplies}
-            threadUri={threadUri}
-            toggleCollapsed={(e) => {
-              e.stopPropagation();
-              e.preventDefault();
-              if (parentUri) toggleCollapsed(parentUri);
-              console.log("collapse?");
-            }}
+            parentUri={parentUri}
+            toggleCollapsed={(uri) => toggleCollapsed(uri)}
             isCollapsed={isCollapsed}
             depth={props.depth}
           />
@@ -255,8 +242,8 @@ function Replies(props: {
       })}
       {parentUri && depth > 0 && replies.length > 3 && (
         <ThreadLink
-          threadUri={parentUri}
-          parent={{ type: "thread", uri: threadUri }}
+          postUri={parentUri}
+          parent={{ type: "thread", uri: parentUri }}
           className="flex justify-start text-sm text-accent-contrast h-fit hover:underline"
         >
           <div className="mx-[19px] w-0.5 h-[24px] bg-border-light" />
@@ -271,59 +258,42 @@ function Replies(props: {
 const ReplyPost = (props: {
   post: ThreadViewPost;
   isLast: boolean;
-  threadUri: string;
-  toggleCollapsed: (e: React.MouseEvent) => void;
+  parentUri: string;
+  toggleCollapsed: (uri: string) => void;
   isCollapsed: boolean;
   depth: number;
 }) => {
-  const { post, threadUri } = props;
+  const { post, parentUri } = props;
   const postView = post.post;
-  const parent = { type: "thread" as const, uri: threadUri };
 
   const hasReplies = props.post.replies && props.post.replies.length > 0;
 
-  // was in the middle of trying to get the right set of comments to close when this line is clicked
-  // then i really need to style the parent and grandparent threads, hide some of the content unless its the main post
-  // the thread line on them is also weird
   return (
     <div className="threadReply relative flex flex-col">
-      {props.depth > 0 && (
-        <button
-          onClick={(e) => {
-            props.toggleCollapsed(e);
-          }}
-          className="replyThreadLine absolute top-0 bottom-0 left-1 z-0 cursor-pointer shrink-0 "
-          aria-label={"Toggle replies"}
-        >
-          <div className="mx-[15px] w-0.5 h-full bg-border-light" />
-        </button>
-      )}
-
-      <button
-        className="replyThreadPost flex gap-2  text-left relative py-2 px-2  rounded cursor-pointer"
-        onClick={() => {
-          openPage(parent, { type: "thread", uri: postView.uri });
+      <BskyPostContent
+        post={postView}
+        parent={{ type: "thread", uri: parentUri }}
+        showEmbed={false}
+        showBlueskyLink={false}
+        replyLine={
+          props.depth > 0
+            ? {
+                onToggle: () => {
+                  props.toggleCollapsed(props.parentUri);
+                  console.log("click click");
+                },
+              }
+            : undefined
+        }
+        quoteEnabled
+        replyEnabled
+        replyOnClick={(e) => {
+          e.preventDefault();
+          props.toggleCollapsed(post.post.uri);
         }}
-      >
-        <BskyPostContent
-          post={postView}
-          parent={parent}
-          showEmbed={false}
-          showBlueskyLink={false}
-          quoteCountOnClick={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            openPage(parent, { type: "quotes", uri: postView.uri });
-          }}
-          replyCountOnClick={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            props.toggleCollapsed();
-          }}
-          onEmbedClick={(e) => e.stopPropagation()}
-          className="text-sm z-10"
-        />
-      </button>
+        onEmbedClick={(e) => e.stopPropagation()}
+        className="text-sm z-10"
+      />
       {hasReplies && props.depth < 3 && (
         <div className="ml-[28px] flex">
           {!props.isCollapsed && (
@@ -331,7 +301,6 @@ const ReplyPost = (props: {
               <Replies
                 parentUri={postView.uri}
                 replies={props.post.replies as any[]}
-                threadUri={threadUri}
                 depth={props.depth + 1}
                 parentAuthorDid={props.post.post.author.did}
               />
@@ -342,8 +311,8 @@ const ReplyPost = (props: {
 
       {hasReplies && props.depth >= 3 && (
         <ThreadLink
-          threadUri={props.post.post.uri}
-          parent={{ type: "thread", uri: threadUri }}
+          postUri={props.post.post.uri}
+          parent={{ type: "thread", uri: parentUri }}
           className="text-left ml-10 text-sm text-accent-contrast hover:underline"
         >
           View more replies