diff --git a/apps/mail/components/create/create-email.tsx b/apps/mail/components/create/create-email.tsx
index 26bade119f..d9c4b542e9 100644
--- a/apps/mail/components/create/create-email.tsx
+++ b/apps/mail/components/create/create-email.tsx
@@ -155,8 +155,8 @@ export function CreateEmail({
 
   const handleDialogClose = (open: boolean) => {
     setIsComposeOpen(open ? 'true' : null);
-    if(!open){
-      setDraftId(null)
+    if (!open) {
+      setDraftId(null);
     }
   };
 
@@ -185,7 +185,6 @@ export function CreateEmail({
             <EmailComposer
               key={typedDraft?.id || 'composer'}
               className="mb-12 rounded-2xl border"
-              aliases={aliases}
               onSendEmail={handleSendEmail}
               initialMessage={typedDraft?.content || initialBody}
               initialTo={
diff --git a/apps/mail/components/create/email-composer.tsx b/apps/mail/components/create/email-composer.tsx
index 0f9281dfb8..4dfc17d270 100644
--- a/apps/mail/components/create/email-composer.tsx
+++ b/apps/mail/components/create/email-composer.tsx
@@ -18,6 +18,7 @@ import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover
 import { TextEffect } from '@/components/motion-primitives/text-effect';
 import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip';
 import { useActiveConnection } from '@/hooks/use-connections';
+import { useEmailAliases } from '@/hooks/use-email-aliases';
 import useComposeEditor from '@/hooks/use-compose-editor';
 import { Loader, Check, X as XIcon } from 'lucide-react';
 import { Command, Paperclip, Plus } from 'lucide-react';
@@ -55,11 +56,6 @@ interface EmailComposerProps {
   initialMessage?: string;
   initialAttachments?: File[];
   replyingTo?: string;
-  aliases?: {
-    email: string;
-    name?: string;
-    primary?: boolean;
-  }[];
   onSendEmail: (data: {
     to: string[];
     cc?: string[];
@@ -107,9 +103,9 @@ export function EmailComposer({
   autofocus = false,
   settingsLoading = false,
   replyingTo,
-  aliases = [],
   editorClassName,
 }: EmailComposerProps) {
+  const { data: aliases } = useEmailAliases();
   const [showCc, setShowCc] = useState(initialCc.length > 0);
   const [showBcc, setShowBcc] = useState(initialBcc.length > 0);
   const [isLoading, setIsLoading] = useState(false);
@@ -312,18 +308,18 @@ export function EmailComposer({
   const handleSend = async () => {
     try {
       if (isLoading || isSavingDraft) return;
-      
+
       const values = getValues();
-      
+
       // Validate recipient field
       if (!values.to || values.to.length === 0) {
         toast.error('Recipient is required');
         return;
       }
-      
+
       setIsLoading(true);
       setAiGeneratedMessage(null);
-      
+
       await onSendEmail({
         to: values.to,
         cc: showCc ? values.cc : undefined,
@@ -999,7 +995,7 @@ export function EmailComposer({
         </div>
 
         {/* From */}
-        {aliases.length > 0 && !replyingTo && (
+        {aliases.length > 0 && (
           <div className="flex items-center gap-2 border-b p-3">
             <p className="text-sm font-medium text-[#8C8C8C]">From:</p>
             <Select
@@ -1012,7 +1008,7 @@ export function EmailComposer({
               <SelectTrigger className="h-6 flex-1 border-0 bg-transparent p-0 text-sm font-normal text-black placeholder:text-[#797979] focus:outline-none focus:ring-0 dark:text-white/90">
                 <SelectValue placeholder="Select an email address" />
               </SelectTrigger>
-              <SelectContent>
+              <SelectContent className="z-[99999]">
                 {aliases.map((alias) => (
                   <SelectItem key={alias.email} value={alias.email}>
                     <div className="flex flex-row items-center gap-1">
diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx
index a7eefd9da0..c17b41d29d 100644
--- a/apps/mail/components/mail/mail.tsx
+++ b/apps/mail/components/mail/mail.tsx
@@ -958,18 +958,18 @@ function CategorySelect({ isMultiSelectMode }: { isMultiSelectMode: boolean }) {
       if (!container) return;
 
       const containerWidth = container.offsetWidth;
-      const selectedCategory = categories.find(cat => cat.id === category);
-      
+      const selectedCategory = categories.find((cat) => cat.id === category);
+
       // Calculate approximate widths needed for different text sizes
       const baseIconWidth = (categories.length - 1) * 40; // unselected icons + gaps
       const selectedTextLength = selectedCategory ? selectedCategory.name.length : 10;
-      
+
       // Estimate width needed for different text sizes
       const normalTextWidth = selectedTextLength * 8 + 60; // normal text
-      const smallTextWidth = selectedTextLength * 7 + 50;  // smaller text
-      const xsTextWidth = selectedTextLength * 6 + 40;     // extra small text
+      const smallTextWidth = selectedTextLength * 7 + 50; // smaller text
+      const xsTextWidth = selectedTextLength * 6 + 40; // extra small text
       const minIconWidth = 40; // minimum width for icon-only selected button
-      
+
       const totalNormal = baseIconWidth + normalTextWidth;
       const totalSmall = baseIconWidth + smallTextWidth;
       const totalXs = baseIconWidth + xsTextWidth;
@@ -1066,10 +1066,9 @@ function CategorySelect({ isMultiSelectMode }: { isMultiSelectMode: boolean }) {
             <div className="relative overflow-visible">{cat.icon}</div>
             {isSelected && showText && (
               <div className="flex items-center justify-center gap-2.5 px-0.5">
-                <div className={cn(
-                  " justify-start leading-none text-white  truncate",
-                  getTextClasses()
-                )}>
+                <div
+                  className={cn('justify-start truncate leading-none text-white', getTextClasses())}
+                >
                   {cat.name}
                 </div>
               </div>
diff --git a/apps/mail/components/ui/app-sidebar.tsx b/apps/mail/components/ui/app-sidebar.tsx
index a2496dacf9..987b7bddd8 100644
--- a/apps/mail/components/ui/app-sidebar.tsx
+++ b/apps/mail/components/ui/app-sidebar.tsx
@@ -189,7 +189,7 @@ function ComposeButton() {
     if (!open) {
       await setDialogOpen(null);
     } else {
-      setDialogOpen('true');
+      await setDialogOpen('true');
     }
     await Promise.all([setDraftId(null), setTo(null), setActiveReplyId(null), setMode(null)]);
   };
diff --git a/apps/mail/hooks/use-email-aliases.ts b/apps/mail/hooks/use-email-aliases.ts
index 7c7d7ea80e..02a91e66de 100644
--- a/apps/mail/hooks/use-email-aliases.ts
+++ b/apps/mail/hooks/use-email-aliases.ts
@@ -6,7 +6,6 @@ export function useEmailAliases() {
   const emailAliasesQuery = useQuery(
     trpc.mail.getEmailAliases.queryOptions(void 0, {
       initialData: [] as { email: string; name: string; primary?: boolean }[],
-      staleTime: 1000 * 60 * 60, // 1 hour
     }),
   );
   return emailAliasesQuery;
diff --git a/apps/server/src/lib/driver/google.ts b/apps/server/src/lib/driver/google.ts
index b6d766a1cf..56693fc197 100644
--- a/apps/server/src/lib/driver/google.ts
+++ b/apps/server/src/lib/driver/google.ts
@@ -65,22 +65,30 @@ export class GoogleMailManager implements MailManager {
   }
   public getEmailAliases() {
     return this.withErrorHandler('getEmailAliases', async () => {
+      console.log('Fetching email aliases...');
+
       const profile = await this.gmail.users.getProfile({
         userId: 'me',
       });
+      console.log('Retrieved user profile:', { email: profile.data.emailAddress });
 
       const primaryEmail = profile.data.emailAddress || '';
       const aliases: { email: string; name?: string; primary?: boolean }[] = [
         { email: primaryEmail, primary: true },
       ];
+      console.log('Added primary email to aliases:', { primaryEmail });
 
       const settings = await this.gmail.users.settings.sendAs.list({
         userId: 'me',
       });
+      console.log('Retrieved sendAs settings:', {
+        sendAsCount: settings.data.sendAs?.length || 0,
+      });
 
       if (settings.data.sendAs) {
         settings.data.sendAs.forEach((alias) => {
           if (alias.isPrimary && alias.sendAsEmail === primaryEmail) {
+            console.log('Skipping duplicate primary email:', { email: alias.sendAsEmail });
             return;
           }
 
@@ -89,9 +97,15 @@ export class GoogleMailManager implements MailManager {
             name: alias.displayName || undefined,
             primary: alias.isPrimary || false,
           });
+          console.log('Added alias:', {
+            email: alias.sendAsEmail,
+            name: alias.displayName,
+            primary: alias.isPrimary,
+          });
         });
       }
 
+      console.log('Returning aliases:', { aliasCount: aliases.length });
       return aliases;
     });
   }
@@ -732,13 +746,14 @@ export class GoogleMailManager implements MailManager {
         });
         // Process res.data.messages to extract id and labelIds
         return {
-          messages: res.data.messages?.map(msg => ({
-            id: msg.id,
-            labelIds: msg.labelIds
-          })) || []
+          messages:
+            res.data.messages?.map((msg) => ({
+              id: msg.id,
+              labelIds: msg.labelIds,
+            })) || [],
         };
       },
-      { threadId, email: this.config.auth?.email }
+      { threadId, email: this.config.auth?.email },
     );
   }