From 1dac8ec1aa9f6bac0e06fe838dedaeff74f29b0f Mon Sep 17 00:00:00 2001
From: alma <alma@governance-labs.org>
Date: Mon, 28 Apr 2025 19:42:42 +0200
Subject: [PATCH] courrier multi account restore compose

---
 lib/services/email-service.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/services/email-service.ts b/lib/services/email-service.ts
index ea42ee06..41ba2179 100644
--- a/lib/services/email-service.ts
+++ b/lib/services/email-service.ts
@@ -412,7 +412,9 @@ export async function getEmailContent(
   const client = await getImapConnection(userId, accountId);
   
   try {
-    await client.mailboxOpen(folder);
+    // Remove accountId prefix if present
+    const actualFolder = folder.includes(':') ? folder.split(':')[1] : folder;
+    await client.mailboxOpen(actualFolder);
     
     const message = await client.fetchOne(emailId, {
       source: true,
@@ -477,7 +479,7 @@ export async function getEmailContent(
         text: parsedEmail.text || '',
         html: rawHtml
       },
-      folder,
+      folder: actualFolder,
       contentFetched: true,
       size: size || 0
     };