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}