diff --git a/app/api/courrier/route.ts b/app/api/courrier/route.ts
index 2ef52391..818898fa 100644
--- a/app/api/courrier/route.ts
+++ b/app/api/courrier/route.ts
@@ -175,11 +175,17 @@ export async function GET(request: Request) {
 
     // Function to get mailboxes
     const getMailboxes = async () => {
-      const mailboxes = [];
-      for await (const mailbox of imapClient.listMailboxes()) {
-        mailboxes.push(mailbox);
+      try {
+        const mailboxes = [];
+        const list = await imapClient.list();
+        for (const mailbox of list) {
+          mailboxes.push(mailbox.path);
+        }
+        return mailboxes;
+      } catch (error) {
+        console.error("Error listing mailboxes:", error);
+        return [];
       }
-      return mailboxes;
     };
 
     // Setup paging