diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index 591072f4..36b2dd55 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -421,6 +421,18 @@ export default function CourrierPage() {
               console.log('Auto-selecting account:', updatedAccounts[1]);
               setSelectedAccount(updatedAccounts[1]);
               setShowFolders(true);
+              
+              // Ensure folders are visible for the selected account
+              setExpandedAccounts(prev => ({
+                ...prev,
+                [updatedAccounts[1].id]: true
+              }));
+              
+              // Set initial selected folder
+              setSelectedFolders(prev => ({
+                ...prev,
+                [updatedAccounts[1].id]: 'INBOX'
+              }));
             }
             
             // Preload first page of emails for faster initial rendering