diff --git a/app/mail/page.tsx b/app/mail/page.tsx
index c67bd44..d100e38 100644
--- a/app/mail/page.tsx
+++ b/app/mail/page.tsx
@@ -409,6 +409,13 @@ export default function MailPage() {
     }
   }, [router]);
 
+  // Load emails on mount and when selectedAccount changes
+  useEffect(() => {
+    if (!loading) {
+      loadEmails();
+    }
+  }, [loading, selectedAccount]);
+
   // Show loading state if credentials are not loaded
   if (loading) {
     return (
@@ -600,11 +607,6 @@ export default function MailPage() {
     return emails.find(email => email.id === selectedEmail?.id);
   };
 
-  // Add useEffect to load emails on mount
-  useEffect(() => {
-    loadEmails();
-  }, []);
-
   // Add account management functions
   const handleAddAccount = () => {
     // Implementation for adding a new account