diff --git a/surfsense_web/components/chat-comments/comment-item/comment-item.tsx b/surfsense_web/components/chat-comments/comment-item/comment-item.tsx
index cae8fc0c6..e37e17f6d 100644
--- a/surfsense_web/components/chat-comments/comment-item/comment-item.tsx
+++ b/surfsense_web/components/chat-comments/comment-item/comment-item.tsx
@@ -1,6 +1,8 @@
 "use client";
 
+import { useAtom } from "jotai";
 import { MessageSquare } from "lucide-react";
+import { currentUserAtom } from "@/atoms/user/user-query.atoms";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
@@ -99,8 +101,12 @@ export function CommentItem({
 	onReply,
 	isReply = false,
 }: CommentItemProps) {
-	const displayName =
-		comment.author?.displayName || comment.author?.email.split("@")[0] || "Unknown";
+	const [{ data: currentUser }] = useAtom(currentUserAtom);
+	
+	const isCurrentUser = currentUser?.id === comment.author?.id;
+	const displayName = isCurrentUser
+		? "Me"
+		: comment.author?.displayName || comment.author?.email.split("@")[0] || "Unknown";
 	const email = comment.author?.email || "";
 
 	return (
diff --git a/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx b/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx
index c56dca6c8..1b507b176 100644
--- a/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx
+++ b/surfsense_web/components/chat-comments/comment-thread/comment-thread.tsx
@@ -86,7 +86,7 @@ export function CommentThread({
 
 						{/* Reply items */}
 						{showReplies && hasReplies && (
-							<div className="space-y-2">
+							<div className="space-y-3 pt-2">
 								{thread.replies.map((reply) => (
 									<CommentItem
 										key={reply.id}
@@ -100,8 +100,11 @@ export function CommentThread({
 						)}
 
 						{/* Reply composer or button */}
+			
 						{isReplyComposerOpen ? (
-							<CommentComposer
+							<>
+													<div className="pt-3">
+													<CommentComposer
 								members={members}
 								membersLoading={membersLoading}
 								placeholder="Write a reply..."
@@ -111,14 +114,17 @@ export function CommentThread({
 								onCancel={handleReplyCancel}
 								autoFocus
 							/>
+							</div>
+							</>
+							
 						) : (
 							<Button variant="ghost" size="sm" className="h-7 px-2 text-xs" onClick={handleReply}>
 								<MessageSquare className="mr-1.5 size-3" />
 								Reply
 							</Button>
 						)}
+						</div>
 					</div>
-				</div>
 			)}
 
 			{/* Reply button when no replies yet */}