diff --git a/apps/mail/components/context/command-palette-context.tsx b/apps/mail/components/context/command-palette-context.tsx
index e6897a9ef6..92f8ef3c1b 100644
--- a/apps/mail/components/context/command-palette-context.tsx
+++ b/apps/mail/components/context/command-palette-context.tsx
@@ -739,7 +739,7 @@ export function CommandPalette({ children }: { children: React.ReactNode }) {
 
     const result: CommandGroup[] = [
       {
-        group: 'Search & Filter',
+        group: 'Search',
         items: searchCommands,
       },
       {
diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index e6666e4e2b..b3b4990d0b 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -1,12 +1,12 @@
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@/components/ui/dialog';
+// import {
+//   Dialog,
+//   DialogContent,
+//   DialogDescription,
+//   DialogFooter,
+//   DialogHeader,
+//   DialogTitle,
+//   DialogTrigger,
+// } from '@/components/ui/dialog';
 import {
   DropdownMenu,
   DropdownMenuItem,
@@ -14,17 +14,17 @@ import {
   DropdownMenuTrigger,
 } from '../ui/dropdown-menu';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
-import { Bell, Lightning, Mail, ScanEye, Tag, Trash, User, X, Search } from '../icons/icons';
+import { Bell, Lightning, Mail, ScanEye, Tag, User, X, Search } from '../icons/icons';
 import { useCategorySettings, useDefaultCategoryId } from '@/hooks/use-categories';
 import { ResizablePanel, ResizablePanelGroup } from '@/components/ui/resizable';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useCommandPalette } from '../context/command-palette-context';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { Check, ChevronDown, RefreshCcw } from 'lucide-react';
 
 import { ThreadDisplay } from '@/components/mail/thread-display';
 import { useActiveConnection } from '@/hooks/use-connections';
-import { useMutation, useQuery } from '@tanstack/react-query';
-import { useTRPC } from '@/providers/query-provider';
+// import { useMutation, useQuery } from '@tanstack/react-query';
+// import { useTRPC } from '@/providers/query-provider';
 
 import { useMediaQuery } from '../../hooks/use-media-query';
 
@@ -33,40 +33,40 @@ import * as CustomIcons from '@/components/icons/icons';
 import { isMac } from '@/lib/hotkeys/use-hotkey-utils';
 import { MailList } from '@/components/mail/mail-list';
 import { useHotkeysContext } from 'react-hotkeys-hook';
-import SelectAllCheckbox from './select-all-checkbox';
+// import SelectAllCheckbox from './select-all-checkbox';
 import { useNavigate, useParams } from 'react-router';
 import { useMail } from '@/components/mail/use-mail';
 import { SidebarToggle } from '../ui/sidebar-toggle';
 import { PricingDialog } from '../ui/pricing-dialog';
-import { Textarea } from '@/components/ui/textarea';
-import { useBrainState } from '@/hooks/use-summary';
+// import { Textarea } from '@/components/ui/textarea';
+// import { useBrainState } from '@/hooks/use-summary';
 import { clearBulkSelectionAtom } from './use-mail';
 import AISidebar from '@/components/ui/ai-sidebar';
 import { useThreads } from '@/hooks/use-threads';
-import { useBilling } from '@/hooks/use-billing';
+// import { useBilling } from '@/hooks/use-billing';
 import AIToggleButton from '../ai-toggle-button';
 import { useIsMobile } from '@/hooks/use-mobile';
-import { Switch } from '@/components/ui/switch';
+// import { Switch } from '@/components/ui/switch';
 import { Button } from '@/components/ui/button';
 import { useLabels } from '@/hooks/use-labels';
 import { useSession } from '@/lib/auth-client';
-import { ScrollArea } from '../ui/scroll-area';
-import { Label } from '@/components/ui/label';
-import { Input } from '@/components/ui/input';
+// import { ScrollArea } from '../ui/scroll-area';
+// import { Label } from '@/components/ui/label';
+// import { Input } from '@/components/ui/input';
 
 import { cn } from '@/lib/utils';
 
 import { m } from '@/paraglide/messages';
 import { useQueryState } from 'nuqs';
 import { useAtom } from 'jotai';
-import { toast } from 'sonner';
+// import { toast } from 'sonner';
 
-interface ITag {
-  id: string;
-  name: string;
-  usecase: string;
-  text: string;
-}
+// interface ITag {
+//   id: string;
+//   name: string;
+//   usecase: string;
+//   text: string;
+// }
 
 export const defaultLabels = [
   {
@@ -101,282 +101,282 @@ export const defaultLabels = [
   },
 ];
 
-const AutoLabelingSettings = () => {
-  const trpc = useTRPC();
-  const [open, setOpen] = useState(false);
-  const { data: storedLabels, refetch: refetchStoredLabels } = useQuery(
-    trpc.brain.getLabels.queryOptions(void 0, {
-      staleTime: 1000 * 60 * 60, // 1 hour
-    }),
-  );
-  const { mutateAsync: updateLabels, isPending } = useMutation(
-    trpc.brain.updateLabels.mutationOptions({
-      onSuccess: () => {
-        refetchStoredLabels();
-      },
-    }),
-  );
-  const [, setPricingDialog] = useQueryState('pricingDialog');
-  const [labels, setLabels] = useState<ITag[]>([]);
-  const [newLabel, setNewLabel] = useState({ name: '', usecase: '' });
-  const { mutateAsync: EnableBrain, isPending: isEnablingBrain } = useMutation(
-    trpc.brain.enableBrain.mutationOptions(),
-  );
-  const { mutateAsync: DisableBrain, isPending: isDisablingBrain } = useMutation(
-    trpc.brain.disableBrain.mutationOptions(),
-  );
-  const { data: brainState, refetch: refetchBrainState } = useBrainState();
-  const { isLoading, isPro } = useBilling();
-
-  useEffect(() => {
-    if (storedLabels) {
-      setLabels(
-        storedLabels.map((label) => ({
-          id: label.name,
-          name: label.name,
-          text: label.name,
-          usecase: label.usecase,
-        })),
-      );
-    }
-  }, [storedLabels]);
-
-  const handleResetToDefault = useCallback(() => {
-    setLabels(
-      defaultLabels.map((label) => ({
-        id: label.name,
-        name: label.name,
-        text: label.name,
-        usecase: label.usecase,
-      })),
-    );
-  }, [storedLabels]);
-
-  const handleAddLabel = () => {
-    if (!newLabel.name || !newLabel.usecase) return;
-    setLabels([...labels, { id: newLabel.name, ...newLabel, text: newLabel.name }]);
-    setNewLabel({ name: '', usecase: '' });
-  };
-
-  const handleDeleteLabel = (id: string) => {
-    setLabels(labels.filter((label) => label.id !== id));
-  };
-
-  const handleUpdateLabel = (id: string, field: 'name' | 'usecase', value: string) => {
-    setLabels(
-      labels.map((label) =>
-        label.id === id
-          ? { ...label, [field]: value, text: field === 'name' ? value : label.text }
-          : label,
-      ),
-    );
-  };
-
-  const handleSubmit = async () => {
-    const updatedLabels = labels.map((label) => ({
-      name: label.name,
-      usecase: label.usecase,
-    }));
-
-    if (newLabel.name.trim() && newLabel.usecase.trim()) {
-      updatedLabels.push({
-        name: newLabel.name,
-        usecase: newLabel.usecase,
-      });
-    }
-    await updateLabels({ labels: updatedLabels });
-    setOpen(false);
-    toast.success('Labels updated successfully, Zero will start using them.');
-  };
-
-  const handleEnableBrain = useCallback(async () => {
-    toast.promise(EnableBrain, {
-      loading: 'Enabling autolabeling...',
-      success: 'Autolabeling enabled successfully',
-      error: 'Failed to enable autolabeling',
-      finally: async () => {
-        await refetchBrainState();
-      },
-    });
-  }, []);
-
-  const handleDisableBrain = useCallback(async () => {
-    toast.promise(DisableBrain, {
-      loading: 'Disabling autolabeling...',
-      success: 'Autolabeling disabled successfully',
-      error: 'Failed to disable autolabeling',
-      finally: async () => {
-        await refetchBrainState();
-      },
-    });
-  }, []);
-
-  const handleToggleAutolabeling = useCallback(() => {
-    if (brainState?.enabled) {
-      handleDisableBrain();
-    } else {
-      handleEnableBrain();
-    }
-  }, [brainState?.enabled]);
-
-  return (
-    <Dialog
-      open={open}
-      onOpenChange={(state) => {
-        if (!isPro) {
-          setPricingDialog('true');
-        } else {
-          setOpen(state);
-        }
-      }}
-    >
-      <DialogTrigger asChild>
-        <div className="flex items-center gap-2">
-          <Switch
-            disabled={isEnablingBrain || isDisablingBrain || isLoading}
-            checked={brainState?.enabled ?? false}
-          />
-          <span className="text-muted-foreground cursor-pointer text-xs font-medium">
-            Auto label
-          </span>
-        </div>
-      </DialogTrigger>
-      <DialogContent showOverlay className="max-w-2xl">
-        <DialogHeader>
-          <div className="flex items-center justify-between">
-            <DialogTitle>Label Settings</DialogTitle>
-            <button
-              onClick={handleToggleAutolabeling}
-              className="bg-offsetLight dark:bg-offsetDark flex items-center gap-2 rounded-lg border px-1.5 py-1"
-            >
-              <span className="text-muted-foreground text-sm">
-                {isEnablingBrain || isDisablingBrain
-                  ? 'Updating...'
-                  : brainState?.enabled
-                    ? 'Disable autolabeling'
-                    : 'Enable autolabeling'}
-              </span>
-              <Switch checked={brainState?.enabled} />
-            </button>
-          </div>
-          <DialogDescription className="mt-2">
-            Configure the labels that Zero uses to automatically organize your emails.
-          </DialogDescription>
-        </DialogHeader>
-
-        <ScrollArea className="h-[400px]">
-          <div className="space-y-3">
-            {labels.map((label, index) => (
-              <div
-                key={label.id}
-                className="bg-card group relative space-y-2 rounded-lg border p-4 shadow-sm transition-shadow hover:shadow-md"
-              >
-                <div className="flex items-center justify-between">
-                  <Label
-                    htmlFor={`label-name-${index}`}
-                    className="text-muted-foreground text-xs font-medium"
-                  >
-                    Label Name
-                  </Label>
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    className="h-6 w-6 transition-opacity group-hover:opacity-100"
-                    onClick={() => handleDeleteLabel(label.id)}
-                  >
-                    <Trash className="h-3 w-3 fill-[#F43F5E]" />
-                  </Button>
-                </div>
-                <Input
-                  id={`label-name-${index}`}
-                  type="text"
-                  value={label.name}
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                    handleUpdateLabel(label.id, 'name', e.target.value)
-                  }
-                  className="h-8"
-                  placeholder="e.g., Important, Follow-up, Archive"
-                />
-                <div className="space-y-2">
-                  <Label
-                    htmlFor={`label-usecase-${index}`}
-                    className="text-muted-foreground text-xs font-medium"
-                  >
-                    Use Case Description
-                  </Label>
-                  <Textarea
-                    id={`label-usecase-${index}`}
-                    value={label.usecase}
-                    onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
-                      handleUpdateLabel(label.id, 'usecase', e.target.value)
-                    }
-                    className="min-h-[60px] resize-none"
-                    placeholder="Describe when this label should be applied..."
-                  />
-                </div>
-              </div>
-            ))}
-
-            <div className="bg-muted/50 mt-3 space-y-2 rounded-lg border border-dashed p-4">
-              <div className="space-y-2">
-                <Label
-                  htmlFor="new-label-name"
-                  className="text-muted-foreground text-xs font-medium"
-                >
-                  New Label Name
-                </Label>
-                <Input
-                  id="new-label-name"
-                  type="text"
-                  value={newLabel.name}
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                    setNewLabel({ ...newLabel, name: e.target.value })
-                  }
-                  className="h-8 dark:bg-[#141414]"
-                  placeholder="Enter a new label name"
-                />
-              </div>
-              <div className="space-y-2">
-                <Label
-                  htmlFor="new-label-usecase"
-                  className="text-muted-foreground text-xs font-medium"
-                >
-                  Use Case Description
-                </Label>
-                <Textarea
-                  id="new-label-usecase"
-                  value={newLabel.usecase}
-                  onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
-                    setNewLabel({ ...newLabel, usecase: e.target.value })
-                  }
-                  className="min-h-[60px] resize-none dark:bg-[#141414]"
-                  placeholder="Describe when this label should be applied..."
-                />
-              </div>
-              <Button
-                className="mt-2 h-8 w-full"
-                onClick={handleAddLabel}
-                disabled={!newLabel.name || !newLabel.usecase}
-              >
-                Add New Label
-              </Button>
-            </div>
-          </div>
-        </ScrollArea>
-        <DialogFooter className="mt-4">
-          <div className="flex w-full justify-end gap-2">
-            <Button size="xs" variant="outline" onClick={handleResetToDefault}>
-              Default Labels
-            </Button>
-            <Button size="xs" onClick={handleSubmit} disabled={isPending}>
-              Save Changes
-            </Button>
-          </div>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
+// const AutoLabelingSettings = () => {
+//   const trpc = useTRPC();
+//   const [open, setOpen] = useState(false);
+//   const { data: storedLabels, refetch: refetchStoredLabels } = useQuery(
+//     trpc.brain.getLabels.queryOptions(void 0, {
+//       staleTime: 1000 * 60 * 60, // 1 hour
+//     }),
+//   );
+//   const { mutateAsync: updateLabels, isPending } = useMutation(
+//     trpc.brain.updateLabels.mutationOptions({
+//       onSuccess: () => {
+//         refetchStoredLabels();
+//       },
+//     }),
+//   );
+//   const [, setPricingDialog] = useQueryState('pricingDialog');
+//   const [labels, setLabels] = useState<ITag[]>([]);
+//   const [newLabel, setNewLabel] = useState({ name: '', usecase: '' });
+//   const { mutateAsync: EnableBrain, isPending: isEnablingBrain } = useMutation(
+//     trpc.brain.enableBrain.mutationOptions(),
+//   );
+//   const { mutateAsync: DisableBrain, isPending: isDisablingBrain } = useMutation(
+//     trpc.brain.disableBrain.mutationOptions(),
+//   );
+//   const { data: brainState, refetch: refetchBrainState } = useBrainState();
+//   const { isLoading, isPro } = useBilling();
+
+//   useEffect(() => {
+//     if (storedLabels) {
+//       setLabels(
+//         storedLabels.map((label) => ({
+//           id: label.name,
+//           name: label.name,
+//           text: label.name,
+//           usecase: label.usecase,
+//         })),
+//       );
+//     }
+//   }, [storedLabels]);
+
+//   const handleResetToDefault = useCallback(() => {
+//     setLabels(
+//       defaultLabels.map((label) => ({
+//         id: label.name,
+//         name: label.name,
+//         text: label.name,
+//         usecase: label.usecase,
+//       })),
+//     );
+//   }, [storedLabels]);
+
+//   const handleAddLabel = () => {
+//     if (!newLabel.name || !newLabel.usecase) return;
+//     setLabels([...labels, { id: newLabel.name, ...newLabel, text: newLabel.name }]);
+//     setNewLabel({ name: '', usecase: '' });
+//   };
+
+//   const handleDeleteLabel = (id: string) => {
+//     setLabels(labels.filter((label) => label.id !== id));
+//   };
+
+//   const handleUpdateLabel = (id: string, field: 'name' | 'usecase', value: string) => {
+//     setLabels(
+//       labels.map((label) =>
+//         label.id === id
+//           ? { ...label, [field]: value, text: field === 'name' ? value : label.text }
+//           : label,
+//       ),
+//     );
+//   };
+
+//   const handleSubmit = async () => {
+//     const updatedLabels = labels.map((label) => ({
+//       name: label.name,
+//       usecase: label.usecase,
+//     }));
+
+//     if (newLabel.name.trim() && newLabel.usecase.trim()) {
+//       updatedLabels.push({
+//         name: newLabel.name,
+//         usecase: newLabel.usecase,
+//       });
+//     }
+//     await updateLabels({ labels: updatedLabels });
+//     setOpen(false);
+//     toast.success('Labels updated successfully, Zero will start using them.');
+//   };
+
+//   const handleEnableBrain = useCallback(async () => {
+//     toast.promise(EnableBrain, {
+//       loading: 'Enabling autolabeling...',
+//       success: 'Autolabeling enabled successfully',
+//       error: 'Failed to enable autolabeling',
+//       finally: async () => {
+//         await refetchBrainState();
+//       },
+//     });
+//   }, []);
+
+//   const handleDisableBrain = useCallback(async () => {
+//     toast.promise(DisableBrain, {
+//       loading: 'Disabling autolabeling...',
+//       success: 'Autolabeling disabled successfully',
+//       error: 'Failed to disable autolabeling',
+//       finally: async () => {
+//         await refetchBrainState();
+//       },
+//     });
+//   }, []);
+
+//   const handleToggleAutolabeling = useCallback(() => {
+//     if (brainState?.enabled) {
+//       handleDisableBrain();
+//     } else {
+//       handleEnableBrain();
+//     }
+//   }, [brainState?.enabled]);
+
+//   return (
+//     <Dialog
+//       open={open}
+//       onOpenChange={(state) => {
+//         if (!isPro) {
+//           setPricingDialog('true');
+//         } else {
+//           setOpen(state);
+//         }
+//       }}
+//     >
+//       <DialogTrigger asChild>
+//         <div className="flex items-center gap-2">
+//           <Switch
+//             disabled={isEnablingBrain || isDisablingBrain || isLoading}
+//             checked={brainState?.enabled ?? false}
+//           />
+//           <span className="text-muted-foreground cursor-pointer text-xs font-medium">
+//             Auto label
+//           </span>
+//         </div>
+//       </DialogTrigger>
+//       <DialogContent showOverlay className="max-w-2xl">
+//         <DialogHeader>
+//           <div className="flex items-center justify-between">
+//             <DialogTitle>Label Settings</DialogTitle>
+//             <button
+//               onClick={handleToggleAutolabeling}
+//               className="bg-offsetLight dark:bg-offsetDark flex items-center gap-2 rounded-lg border px-1.5 py-1"
+//             >
+//               <span className="text-muted-foreground text-sm">
+//                 {isEnablingBrain || isDisablingBrain
+//                   ? 'Updating...'
+//                   : brainState?.enabled
+//                     ? 'Disable autolabeling'
+//                     : 'Enable autolabeling'}
+//               </span>
+//               <Switch checked={brainState?.enabled} />
+//             </button>
+//           </div>
+//           <DialogDescription className="mt-2">
+//             Configure the labels that Zero uses to automatically organize your emails.
+//           </DialogDescription>
+//         </DialogHeader>
+
+//         <ScrollArea className="h-[400px]">
+//           <div className="space-y-3">
+//             {labels.map((label, index) => (
+//               <div
+//                 key={label.id}
+//                 className="bg-card group relative space-y-2 rounded-lg border p-4 shadow-sm transition-shadow hover:shadow-md"
+//               >
+//                 <div className="flex items-center justify-between">
+//                   <Label
+//                     htmlFor={`label-name-${index}`}
+//                     className="text-muted-foreground text-xs font-medium"
+//                   >
+//                     Label Name
+//                   </Label>
+//                   <Button
+//                     variant="ghost"
+//                     size="icon"
+//                     className="h-6 w-6 transition-opacity group-hover:opacity-100"
+//                     onClick={() => handleDeleteLabel(label.id)}
+//                   >
+//                     <Trash className="h-3 w-3 fill-[#F43F5E]" />
+//                   </Button>
+//                 </div>
+//                 <Input
+//                   id={`label-name-${index}`}
+//                   type="text"
+//                   value={label.name}
+//                   onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+//                     handleUpdateLabel(label.id, 'name', e.target.value)
+//                   }
+//                   className="h-8"
+//                   placeholder="e.g., Important, Follow-up, Archive"
+//                 />
+//                 <div className="space-y-2">
+//                   <Label
+//                     htmlFor={`label-usecase-${index}`}
+//                     className="text-muted-foreground text-xs font-medium"
+//                   >
+//                     Use Case Description
+//                   </Label>
+//                   <Textarea
+//                     id={`label-usecase-${index}`}
+//                     value={label.usecase}
+//                     onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
+//                       handleUpdateLabel(label.id, 'usecase', e.target.value)
+//                     }
+//                     className="min-h-[60px] resize-none"
+//                     placeholder="Describe when this label should be applied..."
+//                   />
+//                 </div>
+//               </div>
+//             ))}
+
+//             <div className="bg-muted/50 mt-3 space-y-2 rounded-lg border border-dashed p-4">
+//               <div className="space-y-2">
+//                 <Label
+//                   htmlFor="new-label-name"
+//                   className="text-muted-foreground text-xs font-medium"
+//                 >
+//                   New Label Name
+//                 </Label>
+//                 <Input
+//                   id="new-label-name"
+//                   type="text"
+//                   value={newLabel.name}
+//                   onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+//                     setNewLabel({ ...newLabel, name: e.target.value })
+//                   }
+//                   className="h-8 dark:bg-[#141414]"
+//                   placeholder="Enter a new label name"
+//                 />
+//               </div>
+//               <div className="space-y-2">
+//                 <Label
+//                   htmlFor="new-label-usecase"
+//                   className="text-muted-foreground text-xs font-medium"
+//                 >
+//                   Use Case Description
+//                 </Label>
+//                 <Textarea
+//                   id="new-label-usecase"
+//                   value={newLabel.usecase}
+//                   onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
+//                     setNewLabel({ ...newLabel, usecase: e.target.value })
+//                   }
+//                   className="min-h-[60px] resize-none dark:bg-[#141414]"
+//                   placeholder="Describe when this label should be applied..."
+//                 />
+//               </div>
+//               <Button
+//                 className="mt-2 h-8 w-full"
+//                 onClick={handleAddLabel}
+//                 disabled={!newLabel.name || !newLabel.usecase}
+//               >
+//                 Add New Label
+//               </Button>
+//             </div>
+//           </div>
+//         </ScrollArea>
+//         <DialogFooter className="mt-4">
+//           <div className="flex w-full justify-end gap-2">
+//             <Button size="xs" variant="outline" onClick={handleResetToDefault}>
+//               Default Labels
+//             </Button>
+//             <Button size="xs" onClick={handleSubmit} disabled={isPending}>
+//               Save Changes
+//             </Button>
+//           </div>
+//         </DialogFooter>
+//       </DialogContent>
+//     </Dialog>
+//   );
+// };
 
 export function MailLayout() {
   const params = useParams<{ folder: string }>();
@@ -481,40 +481,71 @@ export function MailLayout() {
             <div className="w-full md:h-[calc(100dvh-10px)]">
               <div
                 className={cn(
-                  'sticky top-0 z-[15] flex items-center justify-between gap-1.5 p-2 transition-colors md:min-h-14',
+                  'sticky top-0 z-[15] flex items-center justify-between gap-1.5 p-2 pb-0 transition-colors',
                 )}
               >
-                <div className="flex w-full items-center justify-between gap-2">
-                  <div className="flex items-center gap-2">
-                    <SidebarToggle className="h-fit px-2" />
-                    <SelectAllCheckbox />
-                  </div>
-
-                  <div className="flex items-center gap-2">
-                    <div>
-                      {mail.bulkSelected.length > 0 ? (
-                        <div>
-                          <Tooltip>
-                            <TooltipTrigger asChild>
-                              <button
-                                onClick={() => {
-                                  setMail({ ...mail, bulkSelected: [] });
+                <div className="w-full">
+                  <div className="grid grid-cols-12 gap-2">
+                    <SidebarToggle className="col-span-1 h-fit px-2" />
+                    {mail.bulkSelected.length === 0 ? (
+                      <div className="col-span-10 flex gap-2">
+                        <Button
+                          variant="outline"
+                          className={cn(
+                            'text-muted-foreground relative flex h-8 w-full select-none items-center justify-start overflow-hidden rounded-lg border bg-white pl-2 text-left text-sm font-normal shadow-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0 dark:border-none dark:bg-[#141414]',
+                          )}
+                          onClick={() => setIsCommandPaletteOpen('true')}
+                        >
+                          <Search className="fill-[#71717A] dark:fill-[#6F6F6F]" />
+
+                          <span className="hidden truncate pr-20 lg:inline-block">
+                            {activeFilters.length > 0
+                              ? activeFilters.map((f) => f.display).join(', ')
+                              : 'Search'}
+                          </span>
+                          <span className="inline-block truncate pr-20 lg:hidden">
+                            {activeFilters.length > 0
+                              ? `${activeFilters.length} filter${activeFilters.length > 1 ? 's' : ''}`
+                              : 'Search'}
+                          </span>
+
+                          <span className="absolute right-[0rem] flex items-center gap-1">
+                            {/* {activeFilters.length > 0 && (
+                            <Badge variant="secondary" className="ml-2 h-5 rounded px-1">
+                              {activeFilters.length}
+                            </Badge>
+                          )} */}
+                            {activeFilters.length > 0 && (
+                              <Button
+                                variant="ghost"
+                                size="sm"
+                                className="my-auto h-5 rounded-xl px-1.5 text-xs"
+                                onClick={(e) => {
+                                  e.stopPropagation();
+                                  clearAllFilters();
                                 }}
-                                className="flex h-6 items-center gap-1 rounded-md bg-[#313131] px-2 text-xs text-[#A0A0A0] hover:bg-[#252525]"
                               >
-                                <X className="h-3 w-3 fill-[#A0A0A0]" />
-                                <span>esc</span>
-                              </button>
-                            </TooltipTrigger>
-                            <TooltipContent>
-                              {m['common.actions.exitSelectionModeEsc']()}
-                            </TooltipContent>
-                          </Tooltip>
-                        </div>
-                      ) : null}
-                    </div>
-                    <AutoLabelingSettings />
-                    <div className="dark:bg-iconDark/20 relative ml-2 h-3 w-0.5 rounded-full bg-[#E7E7E7]" />{' '}
+                                Clear
+                              </Button>
+                            )}
+                            <kbd className="bg-muted text-md pointer-events-none mr-0.5 hidden h-7 select-none flex-row items-center gap-1 rounded-md border-none px-2 font-medium !leading-[0] opacity-100 sm:flex dark:bg-[#262626] dark:text-[#929292]">
+                              <span
+                                className={cn(
+                                  'h-min !leading-[0.2]',
+                                  isMac ? 'mt-[1px] text-lg' : 'text-sm',
+                                )}
+                              >
+                                {isMac ? '⌘' : 'Ctrl'}{' '}
+                              </span>
+                              <span className="h-min text-sm !leading-[0.2]"> K</span>
+                            </kbd>
+                          </span>
+                        </Button>
+                        {activeConnection?.providerId === 'google' && folder === 'inbox' && (
+                          <CategoryDropdown isMultiSelectMode={mail.bulkSelected.length > 0} />
+                        )}
+                      </div>
+                    ) : null}
                     <Button
                       onClick={() => {
                         refetchThreads();
@@ -524,66 +555,30 @@ export function MailLayout() {
                     >
                       <RefreshCcw className="text-muted-foreground h-4 w-4 cursor-pointer" />
                     </Button>
+                    {mail.bulkSelected.length > 0 ? (
+                      <div className="flex items-center gap-2">
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <button
+                              onClick={() => {
+                                setMail({ ...mail, bulkSelected: [] });
+                              }}
+                              className="flex h-6 items-center gap-1 rounded-md bg-[#313131] px-2 text-xs text-[#A0A0A0] hover:bg-[#252525]"
+                            >
+                              <X className="h-3 w-3 fill-[#A0A0A0]" />
+                              <span>esc</span>
+                            </button>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            {m['common.actions.exitSelectionModeEsc']()}
+                          </TooltipContent>
+                        </Tooltip>
+                      </div>
+                    ) : null}
                   </div>
                 </div>
               </div>
-              <div className="flex gap-2 p-2">
-                <Button
-                  variant="outline"
-                  className={cn(
-                    'text-muted-foreground relative flex h-7 w-full select-none items-center justify-start overflow-hidden rounded-lg border bg-white pl-2 text-left text-sm font-normal shadow-none ring-0 focus-visible:ring-0 focus-visible:ring-offset-0 dark:border-none dark:bg-[#141414]',
-                  )}
-                  onClick={() => setIsCommandPaletteOpen('true')}
-                >
-                  <Search className="fill-[#71717A] dark:fill-[#6F6F6F]" />
-
-                  <span className="hidden truncate pr-20 lg:inline-block">
-                    {activeFilters.length > 0
-                      ? activeFilters.map((f) => f.display).join(', ')
-                      : 'Search & Filter'}
-                  </span>
-                  <span className="inline-block truncate pr-20 lg:hidden">
-                    {activeFilters.length > 0
-                      ? `${activeFilters.length} filter${activeFilters.length > 1 ? 's' : ''}`
-                      : 'Search & Filter'}
-                  </span>
-
-                  <span className="absolute right-[0rem] flex items-center gap-1">
-                    {/* {activeFilters.length > 0 && (
-                      <Badge variant="secondary" className="ml-2 h-5 rounded px-1">
-                        {activeFilters.length}
-                      </Badge>
-                    )} */}
-                    {activeFilters.length > 0 && (
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        className="my-auto h-5 rounded-xl px-1.5 text-xs"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          clearAllFilters();
-                        }}
-                      >
-                        Clear
-                      </Button>
-                    )}
-                    <kbd className="bg-muted text-md pointer-events-none hidden h-[1.875rem] select-none flex-row items-center gap-1 rounded-md border-none px-2 font-medium !leading-[0] opacity-100 sm:flex dark:bg-[#262626] dark:text-[#929292]">
-                      <span
-                        className={cn(
-                          'h-min !leading-[0.2]',
-                          isMac ? 'mt-[1px] text-lg' : 'text-sm',
-                        )}
-                      >
-                        {isMac ? '⌘' : 'Ctrl'}{' '}
-                      </span>
-                      <span className="h-min text-sm !leading-[0.2]"> K</span>
-                    </kbd>
-                  </span>
-                </Button>
-                {activeConnection?.providerId === 'google' && folder === 'inbox' && (
-                  <CategoryDropdown isMultiSelectMode={mail.bulkSelected.length > 0} />
-                )}
-              </div>
+
               <div
                 className={cn(
                   `${category === 'Important' ? 'bg-[#F59E0D]' : category === 'All Mail' ? 'bg-[#006FFE]' : category === 'Personal' ? 'bg-[#39ae4a]' : category === 'Updates' ? 'bg-[#8B5CF6]' : category === 'Promotions' ? 'bg-[#F43F5E]' : category === 'Unread' ? 'bg-[#FF4800]' : 'bg-[#F59E0D]'}`,
@@ -591,7 +586,7 @@ export function MailLayout() {
                   isFetching ? 'opacity-100' : 'opacity-0',
                 )}
               />
-              <div className="relative z-[1] h-[calc(100dvh-(2px+2px))] overflow-hidden pt-0 md:h-[calc(100dvh-7rem)]">
+              <div className="relative z-[1] h-[calc(100dvh-(2px+2px))] overflow-hidden pt-0 md:h-[calc(100dvh-4rem)]">
                 <MailList />
               </div>
             </div>
@@ -768,7 +763,7 @@ function CategoryDropdown({ isMultiSelectMode }: CategoryDropdownProps) {
         <Button
           variant="outline"
           className={cn(
-            'black:text-white text-muted-foreground flex h-7 min-w-fit items-center gap-1 rounded-md border-none px-2',
+            'black:text-white text-muted-foreground flex h-8 min-w-fit items-center gap-1 rounded-md border-none px-2',
           )}
           aria-label="Filter by labels"
           aria-expanded={isOpen}
diff --git a/apps/server/src/pipelines.effect.ts b/apps/server/src/pipelines.effect.ts
index 7629b90503..6dd826d62f 100644
--- a/apps/server/src/pipelines.effect.ts
+++ b/apps/server/src/pipelines.effect.ts
@@ -17,11 +17,11 @@ import {
   SummarizeThread,
   ThreadLabels,
 } from './lib/brain.fallback.prompts';
-// import {
-//   generateAutomaticDraft,
-//   shouldGenerateDraft,
-//   analyzeEmailIntent,
-// } from './thread-workflow-utils';
+import {
+  generateAutomaticDraft,
+  shouldGenerateDraft,
+  analyzeEmailIntent,
+} from './thread-workflow-utils';
 import { defaultLabels, EPrompts, EProviders, type ParsedMessage, type Sender } from './types';
 import { getZeroAgent } from './lib/server-utils';
 import { type gmail_v1 } from '@googleapis/gmail';
@@ -452,89 +452,91 @@ export const runThreadWorkflow = (
         return 'Thread has no messages';
       }
 
-      // const autoDraftId = yield* Effect.tryPromise({
-      //   try: async () => {
-      //     if (!shouldGenerateDraft(thread, foundConnection)) {
-      //       console.log('[THREAD_WORKFLOW] Skipping draft generation for thread:', threadId);
-      //       return null;
-      //     }
-
-      //     const latestMessage = thread.messages[thread.messages.length - 1];
-      //     const emailIntent = analyzeEmailIntent(latestMessage);
-
-      //     console.log('[THREAD_WORKFLOW] Analyzed email intent:', {
-      //       threadId,
-      //       isQuestion: emailIntent.isQuestion,
-      //       isRequest: emailIntent.isRequest,
-      //       isMeeting: emailIntent.isMeeting,
-      //       isUrgent: emailIntent.isUrgent,
-      //     });
-
-      //     if (
-      //       !emailIntent.isQuestion &&
-      //       !emailIntent.isRequest &&
-      //       !emailIntent.isMeeting &&
-      //       !emailIntent.isUrgent
-      //     ) {
-      //       console.log(
-      //         '[THREAD_WORKFLOW] Email does not require a response, skipping draft generation',
-      //       );
-      //       return null;
-      //     }
-
-      //     console.log('[THREAD_WORKFLOW] Generating automatic draft for thread:', threadId);
-      //     const draftContent = await generateAutomaticDraft(
-      //       connectionId.toString(),
-      //       thread,
-      //       foundConnection,
-      //     );
-
-      //     if (draftContent) {
-      //       const latestMessage = thread.messages[thread.messages.length - 1];
-
-      //       const replyTo = latestMessage.sender?.email || '';
-      //       const cc =
-      //         latestMessage.cc
-      //           ?.map((r) => r.email)
-      //           .filter((email) => email && email !== foundConnection.email) || [];
-
-      //       const originalSubject = latestMessage.subject || '';
-      //       const replySubject = originalSubject.startsWith('Re: ')
-      //         ? originalSubject
-      //         : `Re: ${originalSubject}`;
-
-      //       const draftData = {
-      //         to: replyTo,
-      //         cc: cc.join(', '),
-      //         bcc: '',
-      //         subject: replySubject,
-      //         message: draftContent,
-      //         attachments: [],
-      //         id: null,
-      //         threadId: threadId.toString(),
-      //         fromEmail: foundConnection.email,
-      //       };
-
-      //       try {
-      //         const createdDraft = await agent.createDraft(draftData);
-      //         console.log('[THREAD_WORKFLOW] Created automatic draft:', {
-      //           threadId,
-      //           draftId: createdDraft?.id,
-      //         });
-      //         return createdDraft?.id || null;
-      //       } catch (error) {
-      //         console.log('[THREAD_WORKFLOW] Failed to create automatic draft:', {
-      //           threadId,
-      //           error: error instanceof Error ? error.message : String(error),
-      //         });
-      //         return null;
-      //       }
-      //     }
-
-      //     return null;
-      //   },
-      //   catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
-      // });
+      const autoDraftId = yield* Effect.tryPromise({
+        try: async () => {
+          if (!shouldGenerateDraft(thread, foundConnection)) {
+            console.log('[THREAD_WORKFLOW] Skipping draft generation for thread:', threadId);
+            return null;
+          }
+
+          const latestMessage = thread.messages[thread.messages.length - 1];
+          const emailIntent = analyzeEmailIntent(latestMessage);
+
+          console.log('[THREAD_WORKFLOW] Analyzed email intent:', {
+            threadId,
+            isQuestion: emailIntent.isQuestion,
+            isRequest: emailIntent.isRequest,
+            isMeeting: emailIntent.isMeeting,
+            isUrgent: emailIntent.isUrgent,
+          });
+
+          if (
+            !emailIntent.isQuestion &&
+            !emailIntent.isRequest &&
+            !emailIntent.isMeeting &&
+            !emailIntent.isUrgent
+          ) {
+            console.log(
+              '[THREAD_WORKFLOW] Email does not require a response, skipping draft generation',
+            );
+            return null;
+          }
+
+          console.log('[THREAD_WORKFLOW] Generating automatic draft for thread:', threadId);
+          const draftContent = await generateAutomaticDraft(
+            connectionId.toString(),
+            thread,
+            foundConnection,
+          );
+
+          if (draftContent) {
+            const latestMessage = thread.messages[thread.messages.length - 1];
+
+            const replyTo = latestMessage.sender?.email || '';
+            const cc =
+              latestMessage.cc
+                ?.map((r) => r.email)
+                .filter((email) => email && email !== foundConnection.email) || [];
+
+            const originalSubject = latestMessage.subject || '';
+            const replySubject = originalSubject.startsWith('Re: ')
+              ? originalSubject
+              : `Re: ${originalSubject}`;
+
+            const draftData = {
+              to: replyTo,
+              cc: cc.join(', '),
+              bcc: '',
+              subject: replySubject,
+              message: draftContent,
+              attachments: [],
+              id: null,
+              threadId: threadId.toString(),
+              fromEmail: foundConnection.email,
+            };
+
+            try {
+              const createdDraft = await agent.createDraft(draftData);
+              console.log('[THREAD_WORKFLOW] Created automatic draft:', {
+                threadId,
+                draftId: createdDraft?.id,
+              });
+              return createdDraft?.id || null;
+            } catch (error) {
+              console.log('[THREAD_WORKFLOW] Failed to create automatic draft:', {
+                threadId,
+                error: error instanceof Error ? error.message : String(error),
+              });
+              return null;
+            }
+          }
+
+          return null;
+        },
+        catch: (error) => ({ _tag: 'DatabaseError' as const, error }),
+      });
+
+      yield* Console.log('[THREAD_WORKFLOW] ' + autoDraftId);
 
       yield* Console.log('[THREAD_WORKFLOW] Processing thread messages and vectorization');