diff --git a/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeDesktop.tsx b/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeDesktop.tsx
index 5aa261a6c6..7e54577caa 100644
--- a/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeDesktop.tsx
+++ b/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeDesktop.tsx
@@ -21,7 +21,7 @@ export function BulkUnsubscribeDesktop(props: {
   const { tableRows, sortColumn, setSortColumn } = props;
 
   return (
-    <Table className="mt-4">
+    <Table>
       <TableHead>
         <TableRow>
           <TableHeaderCell className="pl-6">
@@ -67,7 +67,7 @@ export function BulkUnsubscribeRowDesktop({
   onDoubleClick,
   hasUnsubscribeAccess,
   mutate,
-  setOpenedNewsletter,
+  onOpenNewsletter,
   userGmailLabels,
   openPremiumModal,
   userEmail,
@@ -121,7 +121,7 @@ export function BulkUnsubscribeRowDesktop({
           hasUnsubscribeAccess={hasUnsubscribeAccess}
           mutate={mutate}
           refetchPremium={refetchPremium}
-          setOpenedNewsletter={setOpenedNewsletter}
+          onOpenNewsletter={onOpenNewsletter}
           selected={selected}
           userGmailLabels={userGmailLabels}
           openPremiumModal={openPremiumModal}
diff --git a/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeMobile.tsx b/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeMobile.tsx
index b3d35ff162..3af98c4f64 100644
--- a/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeMobile.tsx
+++ b/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeMobile.tsx
@@ -42,7 +42,7 @@ export function BulkUnsubscribeRowMobile({
   refetchPremium,
   mutate,
   hasUnsubscribeAccess,
-  setOpenedNewsletter,
+  onOpenNewsletter,
 }: RowProps) {
   const readPercentage = (item.readEmails / item.value) * 100;
   const archivedEmails = item.value - item.inboxEmails;
@@ -117,19 +117,12 @@ export function BulkUnsubscribeRowMobile({
             variant={
               item.status === NewsletterStatus.UNSUBSCRIBED ? "red" : "default"
             }
-            disabled={!item.lastUnsubscribeLink}
             asChild={!!item.lastUnsubscribeLink}
           >
             <Link
-              className={
-                hasUnsubscribeAccess
-                  ? undefined
-                  : "pointer-events-none opacity-50"
-              }
               href={
-                hasUnsubscribeAccess
-                  ? (cleanUnsubscribeLink(item.lastUnsubscribeLink ?? "#") ??
-                    "#")
+                hasUnsubscribeAccess && item.lastUnsubscribeLink
+                  ? cleanUnsubscribeLink(item.lastUnsubscribeLink) || "#"
                   : "#"
               }
               target="_blank"
@@ -159,7 +152,7 @@ export function BulkUnsubscribeRowMobile({
           <Button
             size="sm"
             variant="secondary"
-            onClick={() => setOpenedNewsletter(item)}
+            onClick={() => onOpenNewsletter(item)}
           >
             <MoreVerticalIcon className="mr-2 size-4" />
             More
diff --git a/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeSection.tsx b/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeSection.tsx
index 1b70adc7f5..3903020f7b 100644
--- a/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeSection.tsx
+++ b/apps/web/app/(app)/bulk-unsubscribe/BulkUnsubscribeSection.tsx
@@ -3,6 +3,7 @@
 import React, { useState } from "react";
 import { useSession } from "next-auth/react";
 import useSWR from "swr";
+import { usePostHog } from "posthog-js/react";
 import { FilterIcon } from "lucide-react";
 import { Title } from "@tremor/react";
 import type { DateRange } from "react-day-picker";
@@ -25,7 +26,6 @@ import {
 import BulkUnsubscribeSummary from "@/app/(app)/bulk-unsubscribe/BulkUnsubscribeSummary";
 import { useStatLoader } from "@/providers/StatLoaderProvider";
 import { usePremiumModal } from "@/app/(app)/premium/PremiumModal";
-import { Toggle } from "@/components/Toggle";
 import { useLabels } from "@/hooks/useLabels";
 import {
   BulkUnsubscribeMobile,
@@ -37,6 +37,7 @@ import {
 } from "@/app/(app)/bulk-unsubscribe/BulkUnsubscribeDesktop";
 import { Card } from "@/components/ui/card";
 import { ShortcutTooltip } from "@/app/(app)/bulk-unsubscribe/ShortcutTooltip";
+import { SearchBar } from "@/app/(app)/bulk-unsubscribe/SearchBar";
 
 type Newsletter = NewsletterStatsResponse["newsletters"][number];
 
@@ -58,15 +59,14 @@ export function BulkUnsubscribeSection({
 
   const { typesArray } = useEmailsToIncludeFilter();
   const { filtersArray, filters, setFilters } = useNewsletterFilter();
-  const [includeMissingUnsubscribe, setIncludeMissingUnsubscribe] =
-    useState(false);
+  const posthog = usePostHog();
 
   const params: NewsletterStatsQuery = {
     types: typesArray,
     filters: filtersArray,
     orderBy: sortColumn,
     limit: 100,
-    includeMissingUnsubscribe,
+    includeMissingUnsubscribe: true,
     ...getDateRangeParams(dateRange),
   };
   const urlParams = new URLSearchParams(params as any);
@@ -83,6 +83,11 @@ export function BulkUnsubscribeSection({
   const { expanded, extra } = useExpanded();
   const [openedNewsletter, setOpenedNewsletter] = React.useState<Newsletter>();
 
+  const onOpenNewsletter = (newsletter: Newsletter) => {
+    setOpenedNewsletter(newsletter);
+    posthog?.capture("Clicked Expand Sender");
+  };
+
   const [selectedRow, setSelectedRow] = React.useState<
     Newsletter | undefined
   >();
@@ -90,13 +95,15 @@ export function BulkUnsubscribeSection({
   useBulkUnsubscribeShortcuts({
     newsletters: data?.newsletters,
     selectedRow,
-    setOpenedNewsletter,
+    onOpenNewsletter,
     setSelectedRow,
     refetchPremium,
     hasUnsubscribeAccess,
     mutate,
   });
 
+  const [search, setSearch] = useState("");
+
   const { isLoading: isStatsLoading } = useStatLoader();
 
   const { userLabels } = useLabels();
@@ -108,20 +115,29 @@ export function BulkUnsubscribeSection({
     : BulkUnsubscribeRowDesktop;
 
   const tableRows = data?.newsletters
+    .filter(
+      search
+        ? (item) =>
+            item.name.toLowerCase().includes(search.toLowerCase()) ||
+            item.lastUnsubscribeLink
+              ?.toLowerCase()
+              .includes(search.toLowerCase())
+        : Boolean,
+    )
     .slice(0, expanded ? undefined : 50)
     .map((item) => (
       <RowComponent
         key={item.name}
         item={item}
         userEmail={userEmail}
-        setOpenedNewsletter={setOpenedNewsletter}
+        onOpenNewsletter={onOpenNewsletter}
         userGmailLabels={userLabels}
         mutate={mutate}
         selected={selectedRow?.name === item.name}
         onSelectRow={() => {
           setSelectedRow(item);
         }}
-        onDoubleClick={() => setOpenedNewsletter(item)}
+        onDoubleClick={() => onOpenNewsletter(item)}
         hasUnsubscribeAccess={hasUnsubscribeAccess}
         refetchPremium={refetchPremium}
         openPremiumModal={openModal}
@@ -132,21 +148,16 @@ export function BulkUnsubscribeSection({
     <>
       {!isMobile && <BulkUnsubscribeSummary />}
       <Card className="mt-0 p-0 md:mt-4">
-        <div className="items-center justify-between px-2 pt-2 sm:px-6 sm:pt-6 md:flex">
-          <Title className="hidden md:block">Bulk Unsubscribe</Title>
-          <div className="mt-2 flex flex-wrap items-center justify-end gap-1 sm:gap-2 md:mt-0 lg:flex-nowrap">
+        <div className="items-center justify-between px-2 pt-2 sm:px-6 sm:pt-4 md:flex">
+          <Title className="hidden md:block">
+            Bulk unsubscribe from emails
+          </Title>
+          <div className="mt-2 flex flex-wrap items-center justify-end gap-1 md:mt-0 lg:flex-nowrap">
             <div className="hidden md:block">
               <ShortcutTooltip />
             </div>
 
-            <Toggle
-              label="Missing unsubscribe"
-              name="missing-unsubscribe"
-              enabled={includeMissingUnsubscribe}
-              onChange={() => {
-                setIncludeMissingUnsubscribe(!includeMissingUnsubscribe);
-              }}
-            />
+            <SearchBar onSearch={setSearch} />
 
             <DetailedStatsFilter
               label="Filter"
@@ -163,21 +174,21 @@ export function BulkUnsubscribeSection({
                     }),
                 },
                 {
-                  label: "Auto Archived",
-                  checked: filters.autoArchived,
+                  label: "Unsubscribed",
+                  checked: filters.unsubscribed,
                   setChecked: () =>
                     setFilters({
                       ...filters,
-                      ["autoArchived"]: !filters.autoArchived,
+                      ["unsubscribed"]: !filters.unsubscribed,
                     }),
                 },
                 {
-                  label: "Unsubscribed",
-                  checked: filters.unsubscribed,
+                  label: "Auto Archived",
+                  checked: filters.autoArchived,
                   setChecked: () =>
                     setFilters({
                       ...filters,
-                      ["unsubscribed"]: !filters.unsubscribed,
+                      ["autoArchived"]: !filters.autoArchived,
                     }),
                 },
                 {
diff --git a/apps/web/app/(app)/bulk-unsubscribe/SearchBar.tsx b/apps/web/app/(app)/bulk-unsubscribe/SearchBar.tsx
new file mode 100644
index 0000000000..0428d2dc8a
--- /dev/null
+++ b/apps/web/app/(app)/bulk-unsubscribe/SearchBar.tsx
@@ -0,0 +1,64 @@
+"use client";
+
+import { z } from "zod";
+import { SearchIcon } from "lucide-react";
+import { useCallback, useState } from "react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import throttle from "lodash/throttle";
+import { Input } from "@/components/Input";
+import { Button } from "@/components/ui/button";
+
+const searchSchema = z.object({ search: z.string() });
+
+export function SearchBar({
+  onSearch,
+}: {
+  onSearch: (search: string) => void;
+}) {
+  const [showSearch, setShowSearch] = useState(false);
+
+  const {
+    register,
+    formState: { errors },
+    watch,
+  } = useForm<z.infer<typeof searchSchema>>({
+    resolver: zodResolver(searchSchema),
+    defaultValues: { search: "" },
+  });
+
+  const throttledSearch = useCallback(
+    throttle((value: string) => {
+      onSearch(value.trim());
+    }, 300),
+    [onSearch],
+  );
+
+  watch((data) => {
+    if (data.search !== undefined) {
+      throttledSearch(data.search);
+    }
+  });
+  return (
+    <>
+      <Button
+        variant="ghost"
+        size="icon"
+        onClick={() => setShowSearch(!showSearch)}
+      >
+        <SearchIcon className="size-5" />
+      </Button>
+      {showSearch && (
+        <form>
+          <Input
+            type="text"
+            name="search"
+            placeholder="Search"
+            registerProps={register("search", { required: true })}
+            error={errors.search}
+          />
+        </form>
+      )}
+    </>
+  );
+}
diff --git a/apps/web/app/(app)/bulk-unsubscribe/ShortcutTooltip.tsx b/apps/web/app/(app)/bulk-unsubscribe/ShortcutTooltip.tsx
index 46afa52f88..b95e2bdeea 100644
--- a/apps/web/app/(app)/bulk-unsubscribe/ShortcutTooltip.tsx
+++ b/apps/web/app/(app)/bulk-unsubscribe/ShortcutTooltip.tsx
@@ -18,8 +18,8 @@ export function ShortcutTooltip() {
         </div>
       }
     >
-      <Button size="icon" variant="link">
-        <SquareSlashIcon className="h-5 w-5" />
+      <Button size="icon" variant="ghost">
+        <SquareSlashIcon className="size-5" />
       </Button>
     </Tooltip>
   );
diff --git a/apps/web/app/(app)/bulk-unsubscribe/common.tsx b/apps/web/app/(app)/bulk-unsubscribe/common.tsx
index bda1e42612..38f64b2f7b 100644
--- a/apps/web/app/(app)/bulk-unsubscribe/common.tsx
+++ b/apps/web/app/(app)/bulk-unsubscribe/common.tsx
@@ -53,7 +53,7 @@ import type { GroupsResponse } from "@/app/api/user/group/route";
 import { addGroupItemAction } from "@/utils/actions/group";
 import { toastError, toastSuccess } from "@/components/Toast";
 import { createFilterAction } from "@/utils/actions/mail";
-import { isActionError, isErrorMessage } from "@/utils/error";
+import { captureException, isActionError, isErrorMessage } from "@/utils/error";
 import type { GetThreadsResponse } from "@/app/api/google/threads/basic/route";
 import { archiveEmails, deleteEmails } from "@/providers/QueueProvider";
 import { isDefined } from "@/utils/types";
@@ -65,7 +65,7 @@ export function ActionCell<T extends Row>({
   hasUnsubscribeAccess,
   mutate,
   refetchPremium,
-  setOpenedNewsletter,
+  onOpenNewsletter,
   userGmailLabels,
   openPremiumModal,
   userEmail,
@@ -74,7 +74,7 @@ export function ActionCell<T extends Row>({
   hasUnsubscribeAccess: boolean;
   mutate: () => Promise<void>;
   refetchPremium: () => Promise<any>;
-  setOpenedNewsletter: React.Dispatch<React.SetStateAction<T | undefined>>;
+  onOpenNewsletter: (row: T) => void;
   selected: boolean;
   userGmailLabels: LabelsResponse["labels"];
   openPremiumModal: () => void;
@@ -137,7 +137,7 @@ export function ActionCell<T extends Row>({
         />
       </Tooltip>
       <MoreDropdown
-        setOpenedNewsletter={setOpenedNewsletter}
+        onOpenNewsletter={onOpenNewsletter}
         item={item}
         userEmail={userEmail}
         userGmailLabels={userGmailLabels}
@@ -167,15 +167,23 @@ export function useUnsubscribeButton<T extends Row>({
 
     setUnsubscribeLoading(true);
 
-    await setNewsletterStatusAction({
-      newsletterEmail: item.name,
-      status: NewsletterStatus.UNSUBSCRIBED,
-    });
-    await mutate();
-    await decrementUnsubscribeCreditAction();
-    await refetchPremium();
-
-    posthog.capture("Clicked Unsubscribe");
+    try {
+      posthog.capture("Clicked Unsubscribe");
+
+      await setNewsletterStatusAction({
+        newsletterEmail: item.name,
+        status:
+          item.status === NewsletterStatus.UNSUBSCRIBED
+            ? null
+            : NewsletterStatus.UNSUBSCRIBED,
+      });
+      await mutate();
+      await decrementUnsubscribeCreditAction();
+      await refetchPremium();
+    } catch (error) {
+      captureException(error);
+      console.error(error);
+    }
 
     setUnsubscribeLoading(false);
   }, [hasUnsubscribeAccess, item.name, mutate, posthog, refetchPremium]);
@@ -311,25 +319,23 @@ function UnsubscribeButton<T extends Row>({
     refetchPremium,
   });
 
+  const isLink = hasUnsubscribeAccess && item.lastUnsubscribeLink;
+
   return (
     <Button
       size="sm"
       variant={
         item.status === NewsletterStatus.UNSUBSCRIBED ? "red" : "secondary"
       }
-      disabled={!item.lastUnsubscribeLink}
-      asChild={!!item.lastUnsubscribeLink}
+      asChild
     >
-      <a
-        className={
-          hasUnsubscribeAccess ? undefined : "pointer-events-none opacity-50"
-        }
+      <Link
         href={
-          hasUnsubscribeAccess
-            ? cleanUnsubscribeLink(item.lastUnsubscribeLink ?? "#")
-            : "#"
+          isLink
+            ? cleanUnsubscribeLink(item.lastUnsubscribeLink || "") || ""
+            : ""
         }
-        target="_blank"
+        target={isLink ? "_blank" : undefined}
         onClick={onUnsubscribe}
         rel="noreferrer"
       >
@@ -338,7 +344,7 @@ function UnsubscribeButton<T extends Row>({
         <span className="block xl:hidden">
           <MailMinusIcon className="size-4" />
         </span>
-      </a>
+      </Link>
     </Button>
   );
 }
@@ -526,13 +532,13 @@ function ApproveButton<T extends Row>({
 }
 
 export function MoreDropdown<T extends Row>({
-  setOpenedNewsletter,
+  onOpenNewsletter,
   item,
   userEmail,
   userGmailLabels,
   posthog,
 }: {
-  setOpenedNewsletter?: (row: T) => void;
+  onOpenNewsletter?: (row: T) => void;
   item: T;
   userEmail: string;
   userGmailLabels: LabelsResponse["labels"];
@@ -552,13 +558,8 @@ export function MoreDropdown<T extends Row>({
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end">
-        {!!setOpenedNewsletter && (
-          <DropdownMenuItem
-            onClick={() => {
-              setOpenedNewsletter(item);
-              posthog?.capture("Clicked Expand Sender");
-            }}
-          >
+        {!!onOpenNewsletter && (
+          <DropdownMenuItem onClick={() => onOpenNewsletter(item)}>
             <ExpandIcon className="mr-2 size-4" />
             <span>View stats</span>
           </DropdownMenuItem>
@@ -667,7 +668,7 @@ export function HeaderButton(props: {
 export function useBulkUnsubscribeShortcuts<T extends Row>({
   newsletters,
   selectedRow,
-  setOpenedNewsletter,
+  onOpenNewsletter,
   setSelectedRow,
   refetchPremium,
   hasUnsubscribeAccess,
@@ -676,7 +677,7 @@ export function useBulkUnsubscribeShortcuts<T extends Row>({
   newsletters?: T[];
   selectedRow?: T;
   setSelectedRow: (row: T) => void;
-  setOpenedNewsletter: (row: T) => void;
+  onOpenNewsletter: (row: T) => void;
   refetchPremium: () => Promise<any>;
   hasUnsubscribeAccess: boolean;
   mutate: () => Promise<any>;
@@ -704,7 +705,7 @@ export function useBulkUnsubscribeShortcuts<T extends Row>({
       } else if (e.key === "Enter") {
         // open modal
         e.preventDefault();
-        setOpenedNewsletter(item);
+        onOpenNewsletter(item);
         return;
       }
 
@@ -755,7 +756,7 @@ export function useBulkUnsubscribeShortcuts<T extends Row>({
     hasUnsubscribeAccess,
     refetchPremium,
     setSelectedRow,
-    setOpenedNewsletter,
+    onOpenNewsletter,
   ]);
 }
 
diff --git a/apps/web/app/(app)/bulk-unsubscribe/types.ts b/apps/web/app/(app)/bulk-unsubscribe/types.ts
index cec0facba4..c27aafb279 100644
--- a/apps/web/app/(app)/bulk-unsubscribe/types.ts
+++ b/apps/web/app/(app)/bulk-unsubscribe/types.ts
@@ -13,9 +13,7 @@ type Newsletter = NewsletterStatsResponse["newsletters"][number];
 
 export interface RowProps {
   item: Newsletter;
-  setOpenedNewsletter: React.Dispatch<
-    React.SetStateAction<Newsletter | undefined>
-  >;
+  onOpenNewsletter: (row: Newsletter) => void;
   userGmailLabels: LabelsResponse["labels"];
   userEmail: string;
   mutate: () => Promise<any>;
diff --git a/apps/web/app/(app)/new-senders/NewSenders.tsx b/apps/web/app/(app)/new-senders/NewSenders.tsx
index 44c687126f..cb3f30d4a8 100644
--- a/apps/web/app/(app)/new-senders/NewSenders.tsx
+++ b/apps/web/app/(app)/new-senders/NewSenders.tsx
@@ -3,6 +3,7 @@
 import React, { useState } from "react";
 import useSWR from "swr";
 import { useSession } from "next-auth/react";
+import { usePostHog } from "posthog-js/react";
 import {
   Card,
   Table,
@@ -35,16 +36,12 @@ import {
 import { DetailedStatsFilter } from "@/app/(app)/stats/DetailedStatsFilter";
 import type { LabelsResponse } from "@/app/api/google/labels/route";
 import { usePremium } from "@/components/PremiumAlert";
-import type { DateRange } from "react-day-picker";
 import { usePremiumModal } from "@/app/(app)/premium/PremiumModal";
 import { useLabels } from "@/hooks/useLabels";
 import { ShortcutTooltip } from "@/app/(app)/bulk-unsubscribe/ShortcutTooltip";
 import { Row } from "@/app/(app)/bulk-unsubscribe/types";
 
-export function NewSenders(props: {
-  dateRange?: DateRange | undefined;
-  refreshInterval: number;
-}) {
+export function NewSenders({ refreshInterval }: { refreshInterval: number }) {
   const session = useSession();
   const userEmail = session.data?.user.email || "";
 
@@ -71,7 +68,12 @@ export function NewSenders(props: {
   const { userLabels } = useLabels();
 
   const { expanded, extra } = useExpanded();
+  const posthog = usePostHog();
   const [openedNewsletter, setOpenedNewsletter] = React.useState<Row>();
+  const onOpenNewsletter = (newsletter: Row) => {
+    setOpenedNewsletter(newsletter);
+    posthog?.capture("Clicked Expand Sender");
+  };
 
   const [selectedRow, setSelectedRow] = React.useState<Row | undefined>();
 
@@ -94,7 +96,7 @@ export function NewSenders(props: {
   useBulkUnsubscribeShortcuts({
     newsletters: rows,
     selectedRow,
-    setOpenedNewsletter,
+    onOpenNewsletter,
     setSelectedRow,
     refetchPremium,
     hasUnsubscribeAccess,
@@ -122,7 +124,7 @@ export function NewSenders(props: {
         />
       </LoadingContent>
       <Card className="mt-2 p-0 sm:mt-4">
-        <div className="items-center justify-between px-2 pt-2 sm:px-6 sm:pt-6 md:flex">
+        <div className="items-center justify-between px-2 pt-2 sm:px-6 sm:pt-4 md:flex">
           <Title>New Senders</Title>
           <div className="ml-4 mt-3 flex justify-end space-x-2 md:mt-0">
             <div className="hidden md:block">
@@ -193,7 +195,7 @@ export function NewSenders(props: {
                       userEmail={userEmail}
                       firstEmail={item.firstEmail}
                       numberOfEmails={item.numberOfEmails}
-                      setOpenedNewsletter={setOpenedNewsletter}
+                      onOpenNewsletter={onOpenNewsletter}
                       userGmailLabels={userLabels}
                       mutate={mutate}
                       selected={selectedRow?.name === item.name}
@@ -214,20 +216,22 @@ export function NewSenders(props: {
       <NewsletterModal
         newsletter={openedNewsletter}
         onClose={() => setOpenedNewsletter(undefined)}
-        refreshInterval={props.refreshInterval}
+        refreshInterval={refreshInterval}
       />
       <PremiumModal />
     </>
   );
 }
 
-function NewSendersTable(props: {
+function NewSendersTable({
+  tableRows,
+  sortColumn,
+  setSortColumn,
+}: {
   tableRows?: React.ReactNode;
   sortColumn: "subject" | "date" | "numberOfEmails";
   setSortColumn: (sortColumn: "subject" | "date" | "numberOfEmails") => void;
 }) {
-  const { tableRows, sortColumn, setSortColumn } = props;
-
   return (
     <Table className="mt-4">
       <TableHead>
@@ -267,12 +271,25 @@ function NewSendersTable(props: {
   );
 }
 
-function NewSenderRow(props: {
+function NewSenderRow({
+  item,
+  firstEmail,
+  numberOfEmails,
+  refetchPremium,
+  openPremiumModal,
+  onOpenNewsletter,
+  selected,
+  onSelectRow,
+  hasUnsubscribeAccess,
+  mutate,
+  userEmail,
+  userGmailLabels,
+}: {
   item: Row;
   firstEmail: { from: string; subject: string; timestamp: number };
   userEmail: string;
   numberOfEmails: number;
-  setOpenedNewsletter: React.Dispatch<React.SetStateAction<Row | undefined>>;
+  onOpenNewsletter: (row: Row) => void;
   userGmailLabels: LabelsResponse["labels"];
   mutate: () => Promise<any>;
   selected: boolean;
@@ -281,16 +298,13 @@ function NewSenderRow(props: {
   refetchPremium: () => Promise<any>;
   openPremiumModal: () => void;
 }) {
-  const { item, firstEmail, numberOfEmails, refetchPremium, openPremiumModal } =
-    props;
-
   return (
     <TableRow
       key={item.name}
-      className={props.selected ? "bg-blue-50" : undefined}
-      aria-selected={props.selected || undefined}
-      data-selected={props.selected || undefined}
-      onMouseEnter={props.onSelectRow}
+      className={selected ? "bg-blue-50" : undefined}
+      aria-selected={selected || undefined}
+      data-selected={selected || undefined}
+      onMouseEnter={onSelectRow}
     >
       <TableCell className="max-w-[200px] truncate pl-6 lg:max-w-[300px]">
         {firstEmail.from}
@@ -303,13 +317,13 @@ function NewSenderRow(props: {
       <TableCell className="flex justify-end gap-2 p-2">
         <ActionCell
           item={item}
-          userEmail={props.userEmail}
-          hasUnsubscribeAccess={props.hasUnsubscribeAccess}
-          mutate={props.mutate}
+          userEmail={userEmail}
+          hasUnsubscribeAccess={hasUnsubscribeAccess}
+          mutate={mutate}
           refetchPremium={refetchPremium}
-          setOpenedNewsletter={props.setOpenedNewsletter}
-          selected={props.selected}
-          userGmailLabels={props.userGmailLabels}
+          onOpenNewsletter={onOpenNewsletter}
+          selected={selected}
+          userGmailLabels={userGmailLabels}
           openPremiumModal={openPremiumModal}
         />
       </TableCell>
diff --git a/apps/web/app/(app)/stats/DetailedStatsFilter.tsx b/apps/web/app/(app)/stats/DetailedStatsFilter.tsx
index ceeb8d523d..cc51f2ccfe 100644
--- a/apps/web/app/(app)/stats/DetailedStatsFilter.tsx
+++ b/apps/web/app/(app)/stats/DetailedStatsFilter.tsx
@@ -40,7 +40,7 @@ export function DetailedStatsFilter(props: {
     >
       <DropdownMenuTrigger asChild>
         <Button
-          variant="outline"
+          variant="ghost"
           size="sm"
           className={cn("h-10 whitespace-nowrap", className)}
         >
diff --git a/apps/web/app/api/ai/cold-email/controller.ts b/apps/web/app/api/ai/cold-email/controller.ts
index 56cb580802..2611460c75 100644
--- a/apps/web/app/api/ai/cold-email/controller.ts
+++ b/apps/web/app/api/ai/cold-email/controller.ts
@@ -120,11 +120,11 @@ async function blockColdEmail(options: {
     user.coldEmailBlocker === ColdEmailSetting.ARCHIVE_AND_LABEL
   ) {
     if (!user.email) throw new Error("User email is required");
-    const gmailLabel = await getOrCreateLabel({
+    const coldEmailLabel = await getOrCreateLabel({
       gmail,
       name: inboxZeroLabels.cold_email,
     });
-    if (!gmailLabel?.id) throw new Error("No gmail label id");
+    if (!coldEmailLabel?.id) console.error("No gmail label id");
 
     const shouldArchive =
       user.coldEmailBlocker === ColdEmailSetting.ARCHIVE_AND_LABEL;
@@ -132,7 +132,9 @@ async function blockColdEmail(options: {
     await labelMessage({
       gmail,
       messageId: email.messageId,
-      addLabelIds: [gmailLabel.id],
+      // label email as "Cold Email"
+      addLabelIds: coldEmailLabel?.id ? [coldEmailLabel.id] : undefined,
+      // archive email
       removeLabelIds: shouldArchive ? [INBOX_LABEL_ID] : undefined,
     });
   }
diff --git a/apps/web/app/api/google/webhook/block-unsubscribed-emails.ts b/apps/web/app/api/google/webhook/block-unsubscribed-emails.ts
new file mode 100644
index 0000000000..1a6f47ad8f
--- /dev/null
+++ b/apps/web/app/api/google/webhook/block-unsubscribed-emails.ts
@@ -0,0 +1,48 @@
+import { type gmail_v1 } from "googleapis";
+import {
+  getOrCreateLabel,
+  INBOX_LABEL_ID,
+  labelMessage,
+} from "@/utils/gmail/label";
+import { inboxZeroLabels } from "@/utils/label";
+import prisma from "@/utils/prisma";
+import { NewsletterStatus } from "@prisma/client";
+
+export async function blockUnsubscribedEmails({
+  from,
+  userId,
+  gmail,
+  messageId,
+}: {
+  from: string;
+  userId: string;
+  gmail: gmail_v1.Gmail;
+  messageId: string;
+}): Promise<boolean> {
+  const sender = await prisma.newsletter.findFirst({
+    where: {
+      userId,
+      email: from,
+      status: NewsletterStatus.UNSUBSCRIBED,
+    },
+  });
+
+  if (!sender) return false;
+
+  const unsubscribeLabel = await getOrCreateLabel({
+    gmail,
+    name: inboxZeroLabels.unsubscribed,
+  });
+  if (!unsubscribeLabel?.id) console.error("No gmail label id");
+
+  await labelMessage({
+    gmail,
+    messageId,
+    // label email as "Unsubscribed"
+    addLabelIds: unsubscribeLabel?.id ? [unsubscribeLabel.id] : undefined,
+    // archive email
+    removeLabelIds: [INBOX_LABEL_ID],
+  });
+
+  return true;
+}
diff --git a/apps/web/app/api/google/webhook/process-history.ts b/apps/web/app/api/google/webhook/process-history.ts
index eecefa36bb..29d8edb2ef 100644
--- a/apps/web/app/api/google/webhook/process-history.ts
+++ b/apps/web/app/api/google/webhook/process-history.ts
@@ -18,6 +18,7 @@ import { ColdEmailSetting, type User } from "@prisma/client";
 import { runColdEmailBlocker } from "@/app/api/ai/cold-email/controller";
 import { captureException } from "@/utils/error";
 import { runRulesOnMessage } from "@/utils/ai/choose-rule/run-rules";
+import { blockUnsubscribedEmails } from "@/app/api/google/webhook/block-unsubscribed-emails";
 
 export async function processHistoryForUser(
   decodedData: {
@@ -60,7 +61,7 @@ export async function processHistoryForUser(
   });
 
   if (!account) {
-    console.error("Google webhook: Account not found", email);
+    console.error(`Google webhook: Account not found. email: ${email}`);
     return NextResponse.json({ ok: true });
   }
 
@@ -69,7 +70,7 @@ export async function processHistoryForUser(
     : undefined;
 
   if (!premium) {
-    console.log("Google webhook: Account not premium", email);
+    console.log(`Google webhook: Account not premium. email: ${email}`);
     return NextResponse.json({ ok: true });
   }
 
@@ -84,8 +85,7 @@ export async function processHistoryForUser(
 
   if (!userHasAiAccess && !userHasColdEmailAccess) {
     console.debug(
-      "Google webhook: does not have hasAiOrColdEmailAccess",
-      email,
+      `Google webhook: does not have hasAiOrColdEmailAccess. email: ${email}`,
     );
     return NextResponse.json({ ok: true });
   }
@@ -96,16 +96,14 @@ export async function processHistoryForUser(
     account.user.coldEmailBlocker !== ColdEmailSetting.DISABLED;
   if (!hasAutomationRules && !shouldBlockColdEmails) {
     console.debug(
-      "Google webhook: has no rules set and cold email blocker disabled",
-      email,
+      `Google webhook: has no rules set and cold email blocker disabled. email: ${email}`,
     );
     return NextResponse.json({ ok: true });
   }
 
   if (!account.access_token || !account.refresh_token) {
     console.error(
-      "Missing access or refresh token. User needs to re-authenticate.",
-      email,
+      `Missing access or refresh token. User needs to re-authenticate. email: ${email}`,
     );
     return NextResponse.json({ ok: true });
   }
@@ -134,13 +132,7 @@ export async function processHistoryForUser(
       ).toString();
 
     console.log(
-      "Webhook: Listing history... Start:",
-      startHistoryId,
-      "lastSyncedHistoryId",
-      account.user.lastSyncedHistoryId,
-      "gmailHistoryId",
-      startHistoryId,
-      email,
+      `Webhook: Listing history... Start: ${startHistoryId} lastSyncedHistoryId: ${account.user.lastSyncedHistoryId} gmailHistoryId: ${startHistoryId} email: ${email}`,
     );
 
     const history = await gmail.users.history.list({
@@ -155,10 +147,7 @@ export async function processHistoryForUser(
 
     if (history.data.history) {
       console.log(
-        "Webhook: Processing...",
-        email,
-        startHistoryId,
-        history.data.historyId,
+        `Webhook: Processing... email: ${email} startHistoryId: ${startHistoryId} historyId: ${history.data.historyId}`,
       );
 
       await processHistory({
@@ -182,10 +171,7 @@ export async function processHistoryForUser(
       });
     } else {
       console.log(
-        "Webhook: No history",
-        decodedData,
-        "startHistoryId:",
-        startHistoryId,
+        `Webhook: No history. startHistoryId: ${startHistoryId}. ${JSON.stringify(decodedData)}`,
       );
 
       // important to save this or we can get into a loop with never receiving history
@@ -195,7 +181,7 @@ export async function processHistoryForUser(
       });
     }
 
-    console.log("Webhook: Completed.", decodedData);
+    console.log(`Webhook: Completed. ${JSON.stringify(decodedData)}`);
 
     return NextResponse.json({ ok: true });
   } catch (error) {
@@ -248,7 +234,7 @@ async function processHistory(options: ProcessHistoryOptions) {
         await processHistoryItem(m, options);
       } catch (error) {
         captureException(error, { extra: { email, messageId: m.message?.id } });
-        console.error("Error processing history item", options.email, error);
+        console.error(`Error processing history item. email: ${email}`, error);
       }
     }
   }
@@ -280,7 +266,9 @@ async function processHistoryItem(
   if (!messageId) return;
   if (!threadId) return;
 
-  console.log("Getting message...", user.email, messageId, threadId);
+  console.log(
+    `Getting message... email: ${user.email} messageId: ${messageId} threadId: ${threadId}`,
+  );
 
   try {
     const [gmailMessage, gmailThread, hasExistingRule] = await Promise.all([
@@ -294,12 +282,27 @@ async function processHistoryItem(
       }),
     ]);
 
+    const message = parseMessage(gmailMessage);
+
+    const blocked = await blockUnsubscribedEmails({
+      from: message.headers.from,
+      userId: user.id,
+      gmail,
+      messageId,
+    });
+
+    if (blocked) {
+      console.log(
+        `Skipping. Blocked unsubscribed email. email: ${user.email} messageId: ${messageId} threadId: ${threadId}`,
+      );
+      return;
+    }
+
     if (hasExistingRule) {
       console.log("Skipping. Rule already exists.");
       return;
     }
 
-    const message = parseMessage(gmailMessage);
     const isThread = !!gmailThread.messages && gmailThread.messages.length > 1;
 
     if (hasAutomationRules && hasAiAutomationAccess) {
@@ -347,7 +350,9 @@ async function processHistoryItem(
   } catch (error: any) {
     // gmail bug or snoozed email: https://stackoverflow.com/questions/65290987/gmail-api-getmessage-method-returns-404-for-message-gotten-from-listhistory-meth
     if (error.message === "Requested entity was not found.") {
-      console.log("Message not found.", user.email, messageId, threadId);
+      console.log(
+        `Message not found. email: ${user.email} messageId: ${messageId} threadId: ${threadId}`,
+      );
       return;
     }
 
diff --git a/apps/web/app/api/user/stats/tinybird/load/load-emails.ts b/apps/web/app/api/user/stats/tinybird/load/load-emails.ts
index 6dedc25f5f..4ad032118d 100644
--- a/apps/web/app/api/user/stats/tinybird/load/load-emails.ts
+++ b/apps/web/app/api/user/stats/tinybird/load/load-emails.ts
@@ -132,11 +132,13 @@ async function saveBatch(
     options;
 
   // 1. find all emails since the last time we ran this function
-  const q = before
-    ? `before:${before / 1000 + 1}`
-    : after
-      ? `after:${after / 1000 - 1}`
-      : undefined;
+  let q: string | undefined;
+
+  if (before) {
+    q = `before:${before / 1000 + 1}`;
+  } else if (after) {
+    q = `after:${after / 1000 - 1}`;
+  }
 
   const res = await gmail.users.messages.list({
     userId: "me",
diff --git a/apps/web/utils/label.ts b/apps/web/utils/label.ts
index 0a0dedeb41..8d09c6858f 100644
--- a/apps/web/utils/label.ts
+++ b/apps/web/utils/label.ts
@@ -3,6 +3,7 @@ export const inboxZeroLabels = {
   labeled: "IZ Labeled",
   acted: "IZ Acted",
   cold_email: "Cold Email",
+  unsubscribed: "Unsubscribed",
   // drafted: "Response Drafted by IZ",
   // suggested_label: "Label Suggested by IZ",
 };