From 7c9535cb25364ae0fd8513e6efb72eb59d1a2bb9 Mon Sep 17 00:00:00 2001
From: alma <alma@governance-labs.org>
Date: Tue, 29 Apr 2025 11:53:20 +0200
Subject: [PATCH] courrier multi account restore compose

---
 app/courrier/page.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index 472b21e4..8900439a 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -1077,7 +1077,14 @@ export default function CourrierPage() {
                           emails={emails} 
                           selectedEmailIds={selectedEmailIds}
                           selectedEmail={selectedEmail}
-                          onSelectEmail={(emailId) => handleEmailSelect(emailId, selectedAccount?.id || '', currentFolder)}
+                          onSelectEmail={(emailId, emailAccountId, emailFolder) => {
+                            // Always use the email's own accountId and folder if available
+                            handleEmailSelect(
+                              emailId, 
+                              emailAccountId || selectedAccount?.id || '', 
+                              emailFolder || currentFolder
+                            );
+                          }}
                           onToggleSelect={toggleEmailSelection}
                           onToggleSelectAll={toggleSelectAll}
                           onToggleStarred={toggleStarred}