diff --git a/lib/services/email-service.ts b/lib/services/email-service.ts
index 264fb0ae..25c0a876 100644
--- a/lib/services/email-service.ts
+++ b/lib/services/email-service.ts
@@ -86,7 +86,8 @@ export async function getImapConnection(
     throw new Error('Invalid email credentials configuration');
   }
   
-  const connectionKey = `${userId}:${credentials.email}`;
+  // Use accountId in connection key to ensure different accounts get different connections
+  const connectionKey = `${userId}:${accountId || 'default'}`;
   const existingConnection = connectionPool[connectionKey];
   
   // Try to get session data from Redis