@bobfrankston/mailx 1.0.278 → 1.0.284

package/README.md

@@ -290,6 +290,7 @@ For known providers, only `email` is required -- IMAP/SMTP settings fill automat
       "email": "you@example.com",
       "name": "Your Name",
       "label": "Work",
+      "spam": "_spam",                    // Optional: enables the ⚠ Spam button in the viewer toolbar
       "imap": { "host": "imap.example.com", "port": 993, "tls": true, "user": "you", "password": "..." },
       "smtp": { "host": "smtp.example.com", "port": 587, "tls": true, "user": "you", "password": "..." }
     }
@@ -297,6 +298,17 @@ For known providers, only `email` is required -- IMAP/SMTP settings fill automat
 }
 ```
 
+**Optional per-account fields:**
+
+| Field | Type | Purpose |
+|-------|------|---------|
+| `spam` | string | IMAP folder path to send messages when the **Spam** (⚠) button is pressed. The button is hidden until this is set. Use the exact folder path on the server (e.g., `"_spam"`, `"INBOX/Spam"`, `"[Gmail]/Spam"`). |
+| `label` | string | Display name in the folder tree (overrides auto-detected). |
+| `defaultSend` | bool | Use this account's SMTP when From doesn't match any account. |
+| `relayDomains` | string[] | Domains to skip in Delivered-To chain (e.g., `["m.connectivity.xyz"]`). |
+| `deliveredToPrefix` | string[] | Strip these prefixes from Delivered-To to recover the clean alias (e.g., `["bobf-ma-", "bobf-"]` — order matters, longest first). |
+| `identityDomains` | string[] | Domains where Delivered-To becomes the reply From (e.g., `["bob.ma"]`). |
+
 **Auto-detected providers:**
 
 | Domain | IMAP | SMTP | Auth | Label |

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":284,"y":38}
+{"height":1421,"width":2151,"x":228,"y":93}

package/client/android.html

@@ -148,6 +148,7 @@
                     <button class="tb-btn" id="btn-reply-all" title="Reply All">↩↩</button>
                     <button class="tb-btn" id="btn-forward" title="Forward">→</button>
                     <button class="tb-btn" id="btn-delete" title="Delete">🗑</button>
+                    <button class="tb-btn" id="btn-spam" title="Mark as spam" hidden>⚠</button>
                     <button class="tb-btn" id="btn-flag" title="Flag">⚑</button>
                     <span style="flex:1"></span>
                     <button class="mv-action mv-action-primary" id="mv-edit-draft" hidden>Edit & Send</button>

package/client/app.js

@@ -5,7 +5,7 @@
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, getSelectedMessages, markBodiesCached } from "./components/message-list.js";
 import { showMessage, getCurrentMessage, initViewer } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
 let baseTitle = "mailx";
@@ -203,6 +203,7 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
     loadMessages(accountId, folderId, 1, specialUse);
     setTitle(`mailx - ${folderName}`);
     setNarrowFolderTitle(folderName);
+    document.dispatchEvent(new CustomEvent("mailx-folder-changed", { detail: { accountId, folderId } }));
 }, () => {
     // Unified inbox handler
     currentFolderSpecialUse = "inbox";
@@ -690,6 +691,58 @@ document.addEventListener("mailx-moved", (e) => {
     undoTimeout = setTimeout(() => { lastMoved = null; }, 60000);
 });
 document.getElementById("btn-delete")?.addEventListener("click", deleteSelectedMessages);
+async function spamSelectedMessages() {
+    const selected = getSelectedMessages();
+    if (selected.length === 0) {
+        const current = getCurrentMessage();
+        if (!current)
+            return;
+        selected.push({ accountId: current.accountId, uid: current.message.uid, folderId: current.message.folderId });
+    }
+    const statusSync = document.getElementById("status-sync");
+    try {
+        const byAccount = new Map();
+        for (const msg of selected) {
+            const uids = byAccount.get(msg.accountId) || [];
+            uids.push(msg.uid);
+            byAccount.set(msg.accountId, uids);
+        }
+        for (const [accountId, uids] of byAccount) {
+            await markAsSpamMessages(accountId, uids);
+        }
+        if (statusSync)
+            statusSync.textContent = `Marked ${selected.length} as spam`;
+        messageState.removeMessages(selected);
+    }
+    catch (e) {
+        if (statusSync)
+            statusSync.textContent = `Spam failed: ${e.message}`;
+        console.error(`Spam failed: ${e.message}`);
+    }
+}
+document.getElementById("btn-spam")?.addEventListener("click", spamSelectedMessages);
+/** Show/hide the Spam button based on whether the current account has "spam" configured. */
+async function refreshSpamButtonVisibility() {
+    const btn = document.getElementById("btn-spam");
+    if (!btn)
+        return;
+    const current = getCurrentMessage();
+    const accountId = current?.accountId || currentAccountId;
+    if (!accountId) {
+        btn.hidden = true;
+        return;
+    }
+    try {
+        const accounts = await getAccounts();
+        const acct = accounts.find((a) => a.id === accountId);
+        btn.hidden = !acct?.spam;
+    }
+    catch {
+        btn.hidden = true;
+    }
+}
+document.addEventListener("mailx-message-shown", refreshSpamButtonVisibility);
+document.addEventListener("mailx-folder-changed", refreshSpamButtonVisibility);
 document.getElementById("btn-compose")?.addEventListener("click", () => openCompose("new"));
 document.getElementById("btn-reply")?.addEventListener("click", () => openCompose("reply"));
 document.getElementById("btn-reply-all")?.addEventListener("click", () => openCompose("replyAll"));

package/client/components/folder-tree.js

@@ -642,11 +642,15 @@ async function loadFolderTree(container) {
         const savedScroll = container.scrollTop;
         // Build entire new tree into a DocumentFragment (off-screen, no reflows)
         const fragment = document.createDocumentFragment();
-        // Unified Inbox (if multiple accounts)
-        if (accounts.length > 1) {
+        // Unified Inbox — always shown so startup auto-selects it consistently
+        // (with one account it's effectively that account's INBOX, but the UI
+        // stays uniform so the auto-select path doesn't fork on account count)
+        if (accounts.length >= 1) {
             const unifiedEl = document.createElement("div");
             unifiedEl.className = "ft-folder ft-unified";
-            unifiedEl.title = "Merged inbox view of all accounts — click to see messages from every account's INBOX sorted by date";
+            unifiedEl.title = accounts.length > 1
+                ? "Merged inbox view of all accounts — click to see messages from every account's INBOX sorted by date"
+                : "Inbox view across all your accounts";
             unifiedEl.innerHTML = `<span class="ft-toggle"> </span><span class="ft-folder-name">All Inboxes</span>`;
             unifiedEl.addEventListener("click", () => {
                 if (selectedElement)

package/client/components/message-viewer.js

@@ -189,11 +189,21 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
         const fromEl = headerEl.querySelector(".mv-from");
         const toEl = headerEl.querySelector(".mv-to");
         fromEl.textContent = formatAddr(msg.from);
-        toEl.textContent = `To: ${msg.to.map(formatAddr).join(", ")}`;
-        if (msg.cc?.length) {
-            toEl.textContent += `  Cc: ${msg.cc.map(formatAddr).join(", ")}`;
+        let toLine = `To: ${msg.to.map(formatAddr).join(", ")}`;
+        if (msg.cc?.length)
+            toLine += `  Cc: ${msg.cc.map(formatAddr).join(", ")}`;
+        // Always-visible Delivered-To line — shown when present and not already
+        // covered by the To/Cc list. Critical for accounts with multiple aliases
+        // where you need to see which one received the message at a glance.
+        const toAddrs = (msg.to || []).map((a) => a.address.toLowerCase());
+        const ccAddrs = (msg.cc || []).map((a) => a.address.toLowerCase());
+        const dt = (msg.deliveredTo || "").toLowerCase();
+        if (msg.deliveredTo && !toAddrs.includes(dt) && !ccAddrs.includes(dt)) {
+            toLine += `  Delivered-To: ${msg.deliveredTo}`;
         }
+        toEl.textContent = toLine;
         headerEl.querySelector(".mv-subject").textContent = msg.subject;
+        document.dispatchEvent(new CustomEvent("mailx-message-shown", { detail: { accountId } }));
         // Right-click on email addresses in header: copy name, copy address,
         // copy both, add to contacts, plus reply actions for the whole message.
         for (const el of [fromEl, toEl]) {
@@ -431,12 +441,12 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
             const err = String(msg.bodyError);
             const isTransient = !!msg.bodyErrorTransient;
             const errBanner = document.createElement("div");
-            errBanner.className = "mv-error-banner";
-            errBanner.style.cssText = "margin:1rem;padding:0.75rem 1rem;border:1px solid var(--color-border);border-left:3px solid #d33;background:var(--color-bg-surface);border-radius:4px;font-size:var(--font-size-sm)";
+            errBanner.className = "mv-system-message mv-system-error";
             errBanner.innerHTML = `
-                <div style="font-weight:600;margin-bottom:0.25rem;color:#d33">Body unavailable</div>
-                <div style="color:var(--color-text-muted);white-space:pre-wrap;word-break:break-word">${err.replace(/[&<>"]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" }[c] || c))}</div>
-                ${isTransient ? `<button id="btn-retry-body" style="margin-top:0.5rem;padding:0.25rem 0.75rem">Retry</button>` : ""}
+                <div class="mv-system-tag">mailx</div>
+                <div class="mv-system-title">Body unavailable</div>
+                <div class="mv-system-body">${err.replace(/[&<>"]/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" }[c] || c))}</div>
+                ${isTransient ? `<div class="mv-system-actions"><button id="btn-retry-body" class="mv-system-btn">Retry</button></div>` : ""}
             `;
             bodyEl.appendChild(errBanner);
             if (isTransient) {

package/client/index.html

@@ -108,6 +108,7 @@
                     <button class="tb-btn" id="btn-reply-all" title="Reply All (Ctrl+Shift+R)">↩↩</button>
                     <button class="tb-btn" id="btn-forward" title="Forward">→</button>
                     <button class="tb-btn" id="btn-delete" title="Delete (Del)">🗑</button>
+                    <button class="tb-btn" id="btn-spam" title="Mark as spam — move to configured spam folder" hidden>⚠</button>
                     <button class="tb-btn" id="btn-flag" title="Flag">⚑</button>
                     <span style="flex:1"></span>
                     <button class="mv-action mv-action-primary" id="mv-edit-draft" hidden>Edit & Send</button>

package/client/lib/api-client.js

@@ -81,6 +81,9 @@ export function moveMessages(accountId, uids, targetFolderId, targetAccountId) {
         return moveMessage(accountId, uids[0], targetFolderId, targetAccountId);
     return ipc().moveMessages?.(accountId, uids, targetFolderId, targetAccountId);
 }
+export function markAsSpamMessages(accountId, uids) {
+    return ipc().markAsSpamMessages?.(accountId, uids);
+}
 export function undeleteMessage(accountId, uid, folderId) {
     return ipc().undeleteMessage?.(accountId, uid, folderId);
 }

package/client/lib/mailxapi.js

@@ -129,6 +129,9 @@
         moveMessages: function(accountId, uids, targetFolderId) {
             return callNode("moveMessages", { accountId: accountId, uids: uids, targetFolderId: targetFolderId });
         },
+        markAsSpamMessages: function(accountId, uids) {
+            return callNode("markAsSpamMessages", { accountId: accountId, uids: uids });
+        },
         markFolderRead: function(accountId, folderId) {
             return callNode("markFolderRead", { folderId: folderId });
         },

package/client/styles/components.css

@@ -637,6 +637,71 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
     font-size: var(--font-size-base);
 }
 
+/* ── System-generated message plaque ──
+ * Visually distinguished from email content so the user knows the message is
+ * from mailx itself (errors, status notices), not part of the rendered email.
+ * Inset card with a "mailx" tag chip in the corner. */
+.mv-system-message {
+    position: relative;
+    margin: var(--gap-lg);
+    padding: var(--gap-lg) var(--gap-lg) var(--gap-md);
+    background: var(--color-bg-surface);
+    border: 1px dashed var(--color-border);
+    border-radius: var(--radius-md);
+    font-family: var(--font-family-base);
+    font-size: var(--font-size-sm);
+    color: var(--color-text);
+    max-width: 640px;
+    box-shadow: 0 1px 2px rgba(0,0,0,0.04);
+
+    .mv-system-tag {
+        position: absolute;
+        top: -0.6em;
+        left: var(--gap-md);
+        padding: 0.1em 0.6em;
+        background: var(--color-bg);
+        border: 1px solid var(--color-border);
+        border-radius: var(--radius-sm);
+        font-size: 0.7rem;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.06em;
+        color: var(--color-text-muted);
+    }
+    .mv-system-title {
+        font-weight: 600;
+        margin-bottom: var(--gap-xs);
+        color: var(--color-text);
+    }
+    .mv-system-body {
+        color: var(--color-text-muted);
+        white-space: pre-wrap;
+        word-break: break-word;
+        line-height: 1.4;
+    }
+    .mv-system-actions {
+        margin-top: var(--gap-sm);
+        display: flex;
+        gap: var(--gap-sm);
+    }
+    .mv-system-btn {
+        padding: 0.3em 0.9em;
+        border: 1px solid var(--color-border);
+        border-radius: var(--radius-sm);
+        background: var(--color-bg);
+        color: var(--color-text);
+        cursor: pointer;
+        font-size: var(--font-size-sm);
+        &:hover { background: var(--color-bg-hover); }
+    }
+    /* Error variant — red accent on tag, title, and left edge */
+    &.mv-system-error {
+        border-left: 3px solid oklch(0.55 0.22 25);
+        .mv-system-tag { color: oklch(0.55 0.22 25); border-color: oklch(0.55 0.22 25); }
+        .mv-system-title { color: oklch(0.55 0.22 25); }
+    }
+}
+
 /* ── Message Viewer ── */
 
 .message-viewer {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.278",
+  "version": "1.0.284",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.22",
-    "@bobfrankston/iflow-node": "^0.1.6",
+    "@bobfrankston/iflow-direct": "^0.1.23",
+    "@bobfrankston/iflow-node": "^0.1.7",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.24",
-    "@bobfrankston/msger": "^0.1.320",
+    "@bobfrankston/msger": "^0.1.321",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -36,9 +36,9 @@
     "ws": "^8.18.0",
     "sql.js": "^1.14.1",
     "@bobfrankston/tcp-transport": "^0.1.4",
-    "@bobfrankston/node-tcp-transport": "^0.1.3",
-    "@bobfrankston/smtp-direct": "^0.1.3",
-    "@bobfrankston/mailx-sync": "^0.1.6"
+    "@bobfrankston/node-tcp-transport": "^0.1.4",
+    "@bobfrankston/smtp-direct": "^0.1.4",
+    "@bobfrankston/mailx-sync": "^0.1.7"
   },
   "devDependencies": {
     "@types/mailparser": "^3.4.6"
@@ -82,11 +82,11 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.22",
-      "@bobfrankston/iflow-node": "^0.1.6",
+      "@bobfrankston/iflow-direct": "^0.1.23",
+      "@bobfrankston/iflow-node": "^0.1.7",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.24",
-      "@bobfrankston/msger": "^0.1.320",
+      "@bobfrankston/msger": "^0.1.321",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",
@@ -98,9 +98,9 @@
       "ws": "^8.18.0",
       "sql.js": "^1.14.1",
       "@bobfrankston/tcp-transport": "^0.1.4",
-      "@bobfrankston/node-tcp-transport": "^0.1.3",
-      "@bobfrankston/smtp-direct": "^0.1.3",
-      "@bobfrankston/mailx-sync": "^0.1.6"
+      "@bobfrankston/node-tcp-transport": "^0.1.4",
+      "@bobfrankston/smtp-direct": "^0.1.4",
+      "@bobfrankston/mailx-sync": "^0.1.7"
     }
   }
 }

package/packages/mailx-api/index.js

@@ -168,6 +168,16 @@ export function createApiRouter(db, imapManager) {
             res.status(500).json({ error: e.message });
         }
     });
+    router.post("/messages/spam", async (req, res) => {
+        try {
+            const { accountId, uids } = req.body;
+            const result = await svc.markAsSpamMessages(accountId, uids);
+            res.json({ ok: true, ...result });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
     // ── Delete (single — kept for backward compat) ──
     router.delete("/message/:accountId/:uid", async (req, res) => {
         try {

package/packages/mailx-core/index.d.ts

@@ -68,6 +68,7 @@ export declare function getMessage(params: {
     hasAttachments: boolean;
     preview: string;
     bodyPath?: string;
+    providerId?: string;
 }>;
 export declare function updateFlags(params: {
     accountId: string;

package/packages/mailx-imap/index.js

@@ -1172,7 +1172,8 @@ export class ImapManager extends EventEmitter {
                     from: toEmailAddress(msg.from?.[0] || {}),
                     to: toEmailAddresses(msg.to || []),
                     cc: toEmailAddresses(msg.cc || []),
-                    flags, size: msg.size || 0, hasAttachments: false, preview: "", bodyPath: ""
+                    flags, size: msg.size || 0, hasAttachments: false, preview: "", bodyPath: "",
+                    providerId: msg.providerId || "",
                 });
                 stored++;
             }
@@ -1578,7 +1579,11 @@ export class ImapManager extends EventEmitter {
     async fetchMessageBodyViaApi(accountId, folderId, uid, folderPath) {
         try {
             const api = this.getGmailProvider(accountId);
-            const msg = await api.fetchOne(folderPath, uid, { source: true });
+            // Read provider_id from the local row so fetchOne can skip the
+            // listMessageIds pagination (the dominant Gmail rate-limit cost).
+            const env = this.db.getMessageByUid(accountId, uid, folderId);
+            const providerId = env?.providerId;
+            const msg = await api.fetchOne(folderPath, uid, { source: true, providerId });
             await api.close();
             if (!msg) {
                 // fetchOne returned null — message doesn't exist on the server anymore

package/packages/mailx-service/index.d.ts

@@ -31,6 +31,12 @@ export declare class MailxService {
     deleteMessages(accountId: string, uids: number[]): Promise<void>;
     moveMessage(accountId: string, uid: number, targetFolderId: number, targetAccountId?: string): Promise<void>;
     moveMessages(accountId: string, uids: number[], targetFolderId: number): Promise<void>;
+    /** Move messages to the account's configured spam folder (accounts.jsonc "spam" path).
+     *  Throws if the account has no spam folder configured or the folder doesn't exist locally. */
+    markAsSpamMessages(accountId: string, uids: number[]): Promise<{
+        targetFolderId: number;
+        moved: number;
+    }>;
     undeleteMessage(accountId: string, uid: number, folderId: number): Promise<void>;
     deleteOnServer(accountId: string, folderPath: string, uid: number): Promise<void>;
     createFolder(accountId: string, parentPath: string, name: string): Promise<void>;

package/packages/mailx-service/index.js

@@ -50,7 +50,7 @@ export class MailxService {
         for (const cfg of settings.accounts) {
             const a = dbAccounts.find(d => d.id === cfg.id);
             if (a)
-                ordered.push({ ...a, label: cfg.label, defaultSend: cfg.defaultSend || false, identityDomains: cfg.identityDomains || [] });
+                ordered.push({ ...a, label: cfg.label, defaultSend: cfg.defaultSend || false, identityDomains: cfg.identityDomains || [], spam: cfg.spam || "" });
         }
         // Append any DB accounts not in settings
         for (const a of dbAccounts) {
@@ -78,9 +78,18 @@ export class MailxService {
         let bodyText = "";
         let hasRemoteContent = false;
         let attachments = [];
+        // Wall-clock cap on the server-side body fetch. Without this, a Gmail
+        // rate-limit cooldown (shared across providers via module-level state)
+        // can park the request indefinitely — the user sees an infinite
+        // "Fetching message body..." spinner with no way to recover. The cap
+        // surfaces a transient error so the viewer can show a retry banner.
+        const BODY_FETCH_TIMEOUT_MS = 45_000;
         let raw = null;
         try {
-            raw = await this.imapManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid);
+            raw = await Promise.race([
+                this.imapManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("body fetch timeout (45s) — server is slow or rate-limited")), BODY_FETCH_TIMEOUT_MS)),
+            ]);
         }
         catch (fetchErr) {
             // Message was deleted from the server (another device, expunge, etc.) —
@@ -453,6 +462,23 @@ export class MailxService {
         // Sync to server in background
         this.imapManager.moveMessages(accountId, messages, targetFolderId).catch(e => console.error(`  Move sync failed: ${e.message}`));
     }
+    /** Move messages to the account's configured spam folder (accounts.jsonc "spam" path).
+     *  Throws if the account has no spam folder configured or the folder doesn't exist locally. */
+    async markAsSpamMessages(accountId, uids) {
+        const settings = loadSettings();
+        const account = settings.accounts.find(a => a.id === accountId);
+        if (!account)
+            throw new Error(`Account ${accountId} not found`);
+        const spamPath = account.spam;
+        if (!spamPath)
+            throw new Error(`Account ${accountId} has no "spam" folder configured`);
+        const folders = this.db.getFolders(accountId);
+        const target = folders.find(f => f.path.toLowerCase() === spamPath.toLowerCase());
+        if (!target)
+            throw new Error(`Spam folder "${spamPath}" not found in ${accountId}`);
+        await this.moveMessages(accountId, uids, target.id);
+        return { targetFolderId: target.id, moved: uids.length };
+    }
     async undeleteMessage(accountId, uid, folderId) {
         await this.imapManager.undeleteMessage(accountId, uid, folderId);
     }

package/packages/mailx-service/jsonrpc.js

@@ -53,6 +53,8 @@ async function dispatchAction(svc, action, p) {
         case "moveMessages":
             await svc.moveMessages(p.accountId, p.uids, p.targetFolderId);
             return { ok: true, count: p.uids.length };
+        case "markAsSpamMessages":
+            return await svc.markAsSpamMessages(p.accountId, p.uids);
         // Folders
         case "markFolderRead":
             svc.markFolderRead(p.folderId);

package/packages/mailx-store/db.d.ts

@@ -66,6 +66,7 @@ export declare class MailxDB {
         hasAttachments: boolean;
         preview: string;
         bodyPath: string;
+        providerId?: string;
     }): number;
     getMessages(query: MessageQuery): PagedResult<MessageEnvelope>;
     /** Unified inbox: all inbox folders across accounts, sorted by date, paginated in SQL */

package/packages/mailx-store/db.js

@@ -146,6 +146,11 @@ export class MailxDB {
             this.db.exec("CREATE INDEX IF NOT EXISTS idx_messages_thread_id ON messages(account_id, thread_id)");
         }
         catch { /* already exists */ }
+        // provider_id: native server-side id for API-backed providers (Gmail
+        // hex id, Outlook Graph id, etc.). Lets fetchOne look up the message
+        // directly instead of paginating listMessageIds for every body fetch
+        // — a UID-only path costs 2-3 rate-limited API calls per message.
+        this.addColumnIfMissing("messages", "provider_id", "TEXT");
     }
     // ── Sent-log (dedup) ──
     /** Has this Message-ID already been sent? Used to prevent the outbox from
@@ -301,8 +306,13 @@ export class MailxDB {
     }
     // ── Messages ──
     upsertMessage(msg) {
-        const existing = this.db.prepare("SELECT id FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(msg.accountId, msg.folderId, msg.uid);
+        const existing = this.db.prepare("SELECT id, provider_id FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(msg.accountId, msg.folderId, msg.uid);
         if (existing) {
+            // Backfill provider_id on existing rows that predate this column —
+            // critical for body fetch to bypass listMessageIds pagination.
+            if (msg.providerId && !existing.provider_id) {
+                this.db.prepare("UPDATE messages SET provider_id = ? WHERE id = ?").run(msg.providerId, existing.id);
+            }
             this.db.prepare(`
                 UPDATE messages SET flags_json = ?, preview = ?, body_path = ?, cached_at = ?
                 WHERE id = ?
@@ -320,9 +330,9 @@ export class MailxDB {
             INSERT INTO messages (
                 account_id, folder_id, uid, message_id, in_reply_to, refs, thread_id,
                 date, subject, from_address, from_name, to_json, cc_json,
-                flags_json, size, has_attachments, preview, body_path, cached_at
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        `).run(msg.accountId, msg.folderId, msg.uid, msg.messageId, msg.inReplyTo, JSON.stringify(msg.references), threadId, msg.date, msg.subject, msg.from.address, msg.from.name, JSON.stringify(msg.to), JSON.stringify(msg.cc), JSON.stringify(msg.flags), msg.size, msg.hasAttachments ? 1 : 0, msg.preview, msg.bodyPath, Date.now());
+                flags_json, size, has_attachments, preview, body_path, cached_at, provider_id
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        `).run(msg.accountId, msg.folderId, msg.uid, msg.messageId, msg.inReplyTo, JSON.stringify(msg.references), threadId, msg.date, msg.subject, msg.from.address, msg.from.name, JSON.stringify(msg.to), JSON.stringify(msg.cc), JSON.stringify(msg.flags), msg.size, msg.hasAttachments ? 1 : 0, msg.preview, msg.bodyPath, Date.now(), msg.providerId || null);
         const rowId = Number(result.lastInsertRowid);
         // Index for full-text search
         try {
@@ -433,7 +443,8 @@ export class MailxDB {
             flags: JSON.parse(r.flags_json),
             size: r.size,
             hasAttachments: !!r.has_attachments,
-            preview: r.preview
+            preview: r.preview,
+            providerId: r.provider_id || undefined,
         };
     }
     getMessageBodyPath(accountId, uid) {

package/packages/mailx-types/index.d.ts

@@ -34,6 +34,7 @@ export interface AccountConfig {
     relayDomains?: string[]; /** Domains to skip in Delivered-To chain (e.g., ["m.connectivity.xyz"]) */
     deliveredToPrefix?: string[]; /** Prefixes to strip from Delivered-To to get clean alias (e.g., ["bobf-ma-", "bobf-"]) — order matters, longest first */
     identityDomains?: string[]; /** Domains where Delivered-To address should become the reply From (e.g., ["bob.ma", "bobf.frankston.com"]) */
+    spam?: string; /** IMAP folder path for "Mark as spam" button (e.g., "_spam"). Button hidden when not set. */
 }
 /** Standard IMAP special-use folder types */
 export type SpecialUse = "inbox" | "sent" | "drafts" | "trash" | "junk" | "archive" | "all";
@@ -75,6 +76,7 @@ export interface MessageEnvelope {
     hasAttachments: boolean;
     preview: string; /** First ~200 chars of body text */
     bodyPath?: string; /** Local body location: "idb:..." or "gmail:<id>" */
+    providerId?: string; /** Native server id (Gmail hex id, Outlook Graph id) — bypasses UID→id pagination on body fetch */
 }
 /** Full message with body content */
 export interface Message extends MessageEnvelope {