From f0710c474b9fe4ae9f58cace694b0e9b7b0bfa55 Mon Sep 17 00:00:00 2001
From: alma <alma@governance-labs.org>
Date: Wed, 30 Apr 2025 13:13:12 +0200
Subject: [PATCH] courrier multi account restore compose

---
 hooks/use-courrier.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/hooks/use-courrier.ts b/hooks/use-courrier.ts
index 69675a85..aa00d98b 100644
--- a/hooks/use-courrier.ts
+++ b/hooks/use-courrier.ts
@@ -396,13 +396,22 @@ export const useCourrier = () => {
       // Log what we're doing
       console.log(`[PAGINATION] Loading page ${page} for folder ${currentFolder}`);
       
-      // Simple approach that doesn't require complex parameter handling
-      changeFolder(currentFolder)
+      // CRITICAL FIX: Extract account ID from current folder to ensure pagination uses the correct account
+      let accountId: string | undefined;
+      
+      if (currentFolder && currentFolder.includes(':')) {
+        const parts = currentFolder.split(':');
+        accountId = parts[0];
+        console.log(`[PAGINATION] Extracted account ID ${accountId} from folder ${currentFolder}`);
+      }
+      
+      // Call changeFolder with explicit account ID when available
+      changeFolder(currentFolder, accountId)
         .catch(err => {
           console.error(`[PAGINATION] Error loading more emails:`, err);
         });
     }
-  }, [page, session?.user?.id, changeFolder]); // Deliberately NOT including currentFolder here
+  }, [page, session?.user?.id, changeFolder, currentFolder]); // Include currentFolder for correct account ID extraction
 
   // ADDING DEBUG LOGS to track currentFolder changes
   useEffect(() => {