@bobfrankston/mailx 1.0.199 → 1.0.201

package/packages/mailx-imap/index.js

@@ -1218,7 +1218,8 @@ export class ImapManager extends EventEmitter {
         return next;
     }
     // Body fetch uses withConnection — no separate client needed
-    /** Fetch a single message body on demand, caching in the store */
+    /** Fetch a single message body on demand, caching in the store.
+     *  Uses its own fresh connection — never blocked by background prefetch. */
     async fetchMessageBody(accountId, folderId, uid) {
         // Already cached?
         if (await this.bodyStore.hasMessage(accountId, folderId, uid)) {
@@ -1233,36 +1234,30 @@ export class ImapManager extends EventEmitter {
         if (this.isGmailAccount(accountId)) {
             return this.fetchMessageBodyViaApi(accountId, folderId, uid, folder.path);
         }
-        // IMAP: serialize — only one body fetch per account at a time
-        return this.enqueueFetch(accountId, async () => {
-            // Re-check cache — may have been fetched while queued
-            if (await this.bodyStore.hasMessage(accountId, folderId, uid)) {
-                return this.bodyStore.getMessage(accountId, folderId, uid);
-            }
-            let client = null;
-            try {
-                client = this.newClient(accountId);
-                const msg = await client.fetchMessageByUid(folder.path, uid, { source: true });
-                await client.logout();
-                client = null;
-                if (!msg?.source)
-                    return null;
-                const raw = Buffer.from(msg.source, "utf-8");
-                const bodyPath = await this.bodyStore.putMessage(accountId, folderId, uid, raw);
-                this.db.updateBodyPath(accountId, uid, bodyPath);
-                return raw;
-            }
-            catch (e) {
-                console.error(`  Body fetch error (${accountId}/${uid}): ${e.message}`);
-                if (client) {
-                    try {
-                        await client.logout();
-                    }
-                    catch { /* */ }
-                }
+        // IMAP: fresh connection per on-demand fetch — never queued behind prefetch
+        let client = null;
+        try {
+            client = this.newClient(accountId);
+            const msg = await client.fetchMessageByUid(folder.path, uid, { source: true });
+            await client.logout();
+            client = null;
+            if (!msg?.source)
                 return null;
+            const raw = Buffer.from(msg.source, "utf-8");
+            const bodyPath = await this.bodyStore.putMessage(accountId, folderId, uid, raw);
+            this.db.updateBodyPath(accountId, uid, bodyPath);
+            return raw;
+        }
+        catch (e) {
+            console.error(`  Body fetch error (${accountId}/${uid}): ${e.message}`);
+            if (client) {
+                try {
+                    await client.logout();
+                }
+                catch { /* */ }
             }
-        });
+            return null;
+        }
     }
     /** Fetch message body via Gmail/Outlook API */
     async fetchMessageBodyViaApi(accountId, folderId, uid, folderPath) {

package/packages/mailx-store-web/gmail-api-web.js

@@ -80,9 +80,12 @@ export class GmailApiWebProvider {
             const specialUse = labelSpecialUse(label);
             const path = label.name || label.id;
             const name = path.includes("/") ? path.split("/").pop() : path;
+            // System labels like INBOX, SENT, TRASH are selectable — don't mark \Noselect
+            // Only container labels (categories) should be noselect
+            const noSelect = label.type === "system" && !specialUse && !label.messagesTotal;
             folders.push({
                 path, name, delimiter: "/", specialUse,
-                flags: label.type === "system" ? ["\\Noselect"] : [],
+                flags: noSelect ? ["\\Noselect"] : [],
             });
         }
         return folders;