diff --git a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
index b63e16317..f313dd6f9 100644
--- a/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx
@@ -4,7 +4,6 @@ import { useAtom } from "jotai";
 import {
 	AlertCircle,
 	AlertTriangle,
-	AtSign,
 	BellDot,
 	Check,
 	CheckCheck,
@@ -15,6 +14,7 @@ import {
 	Inbox,
 	LayoutGrid,
 	ListFilter,
+	MessageSquare,
 	Search,
 	X,
 } from "lucide-react";
@@ -134,7 +134,7 @@ function getConnectorTypeDisplayName(connectorType: string): string {
 	);
 }
 
-type InboxTab = "mentions" | "status";
+type InboxTab = "comments" | "status";
 type InboxFilter = "all" | "unread";
 
 // Tab-specific data source with independent pagination
@@ -187,7 +187,7 @@ export function InboxSidebar({
 	const [, setTargetCommentId] = useAtom(setTargetCommentIdAtom);
 
 	const [searchQuery, setSearchQuery] = useState("");
-	const [activeTab, setActiveTab] = useState<InboxTab>("mentions");
+	const [activeTab, setActiveTab] = useState<InboxTab>("comments");
 	const [activeFilter, setActiveFilter] = useState<InboxFilter>("all");
 	const [selectedConnector, setSelectedConnector] = useState<string | null>(null);
 	const [mounted, setMounted] = useState(false);
@@ -234,12 +234,17 @@ export function InboxSidebar({
 		}
 	}, [activeTab]);
 
-	// Get current tab's data source - each tab has independent data and pagination
-	const currentDataSource = activeTab === "mentions" ? mentions : status;
-	const { loading, loadingMore = false, hasMore = false, loadMore } = currentDataSource;
+	// Both tabs now derive items from status (all types), so use status for pagination
+	const { loading, loadingMore = false, hasMore = false, loadMore } = status;
 
-	// Status tab includes: connector indexing, document processing, page limit exceeded, connector deletion, comment replies
-	// Filter to only show status notification types
+	// Comments tab: mentions and comment replies
+	const commentsItems = useMemo(
+		() =>
+			status.items.filter((item) => item.type === "new_mention" || item.type === "comment_reply"),
+		[status.items]
+	);
+
+	// Status tab: connector indexing, document processing, page limit exceeded, connector deletion
 	const statusItems = useMemo(
 		() =>
 			status.items.filter(
@@ -247,8 +252,7 @@ export function InboxSidebar({
 					item.type === "connector_indexing" ||
 					item.type === "document_processing" ||
 					item.type === "page_limit_exceeded" ||
-					item.type === "connector_deletion" ||
-					item.type === "comment_reply"
+					item.type === "connector_deletion"
 			),
 		[status.items]
 	);
@@ -272,8 +276,8 @@ export function InboxSidebar({
 		}));
 	}, [statusItems]);
 
-	// Get items for current tab - mentions use their source directly, status uses filtered items
-	const displayItems = activeTab === "mentions" ? mentions.items : statusItems;
+	// Get items for current tab
+	const displayItems = activeTab === "comments" ? commentsItems : statusItems;
 
 	// Filter items based on filter type, connector filter, and search query
 	const filteredItems = useMemo(() => {
@@ -336,9 +340,15 @@ export function InboxSidebar({
 		return () => observer.disconnect();
 	}, [loadMore, hasMore, loadingMore, open, searchQuery]);
 
-	// Use unread counts from data sources (more accurate than client-side counting)
-	const unreadMentionsCount = mentions.unreadCount;
-	const unreadStatusCount = status.unreadCount;
+	// Unread counts derived from filtered items
+	const unreadCommentsCount = useMemo(
+		() => commentsItems.filter((item) => !item.read).length,
+		[commentsItems]
+	);
+	const unreadStatusCount = useMemo(
+		() => statusItems.filter((item) => !item.read).length,
+		[statusItems]
+	);
 
 	const handleItemClick = useCallback(
 		async (item: InboxItem) => {
@@ -502,10 +512,10 @@ export function InboxSidebar({
 	};
 
 	const getEmptyStateMessage = () => {
-		if (activeTab === "mentions") {
+		if (activeTab === "comments") {
 			return {
-				title: t("no_mentions") || "No mentions",
-				hint: t("no_mentions_hint") || "You'll see mentions from others here",
+				title: t("no_comments") || "No comments",
+				hint: t("no_comments_hint") || "You'll see mentions and replies here",
 			};
 		}
 		return {
@@ -844,14 +854,14 @@ export function InboxSidebar({
 			>
 				<TabsList className="w-full h-auto p-0 bg-transparent rounded-none border-b">
 					<TabsTrigger
-						value="mentions"
+						value="comments"
 						className="flex-1 rounded-none border-b-2 border-transparent px-1 py-2 text-xs font-medium data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:shadow-none"
 					>
 						<span className="w-full inline-flex items-center justify-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-muted transition-colors">
-							<AtSign className="h-4 w-4" />
-							<span>{t("mentions") || "Mentions"}</span>
+							<MessageSquare className="h-4 w-4" />
+							<span>{t("comments") || "Comments"}</span>
 							<span className="inline-flex items-center justify-center min-w-5 h-5 px-1.5 rounded-full bg-primary/20 text-muted-foreground text-xs font-medium">
-								{formatInboxCount(unreadMentionsCount)}
+								{formatInboxCount(unreadCommentsCount)}
 							</span>
 						</span>
 					</TabsTrigger>
@@ -953,8 +963,8 @@ export function InboxSidebar({
 					</div>
 				) : (
 					<div className="text-center py-8">
-						{activeTab === "mentions" ? (
-							<AtSign className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
+						{activeTab === "comments" ? (
+							<MessageSquare className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
 						) : (
 							<History className="h-12 w-12 mx-auto text-muted-foreground mb-3" />
 						)}
diff --git a/surfsense_web/messages/en.json b/surfsense_web/messages/en.json
index 75b186420..0646bdb52 100644
--- a/surfsense_web/messages/en.json
+++ b/surfsense_web/messages/en.json
@@ -698,10 +698,13 @@
 		"mark_all_read": "Mark all as read",
 		"mark_as_read": "Mark as read",
 		"mentions": "Mentions",
+		"comments": "Comments",
 		"status": "Status",
 		"no_results_found": "No results found",
 		"no_mentions": "No mentions",
 		"no_mentions_hint": "You'll see mentions from others here",
+		"no_comments": "No comments",
+		"no_comments_hint": "You'll see mentions and replies here",
 		"no_status_updates": "No status updates",
 		"no_status_updates_hint": "Document and connector updates will appear here",
 		"filter": "Filter",
diff --git a/surfsense_web/messages/zh.json b/surfsense_web/messages/zh.json
index 81121ef3e..67077c348 100644
--- a/surfsense_web/messages/zh.json
+++ b/surfsense_web/messages/zh.json
@@ -683,10 +683,13 @@
 		"mark_all_read": "全部标记为已读",
 		"mark_as_read": "标记为已读",
 		"mentions": "提及",
+		"comments": "评论",
 		"status": "状态",
 		"no_results_found": "未找到结果",
 		"no_mentions": "没有提及",
 		"no_mentions_hint": "您会在这里看到他人的提及",
+		"no_comments": "没有评论",
+		"no_comments_hint": "您会在这里看到提及和回复",
 		"no_status_updates": "没有状态更新",
 		"no_status_updates_hint": "文档和连接器更新将显示在这里",
 		"filter": "筛选",