@bobfrankston/mailx 1.0.306 → 1.0.310

package/client/index.html

@@ -40,6 +40,7 @@
                     <label class="tb-menu-item"><input type="checkbox" id="opt-autocomplete"> AI autocomplete</label>
                     <hr class="tb-menu-sep">
                     <button class="tb-menu-item" id="btn-edit-jsonc" title="Edit accounts.jsonc / allowlist.jsonc">Edit config files...</button>
+                    <button class="tb-menu-item" id="btn-about" title="Show version and build info">About mailx...</button>
                 </div>
             </div>
             <span id="app-version" class="app-version">mailx</span>

package/client/lib/api-client.js

@@ -161,6 +161,12 @@ export function readJsoncFile(name) {
 export function writeJsoncFile(name, content) {
     return ipc().writeJsoncFile?.(name, content);
 }
+export function readConfigHelp(name) {
+    return ipc().readConfigHelp?.(name) ?? Promise.resolve({ content: "" });
+}
+export function unsubscribeOneClick(url) {
+    return ipc().unsubscribeOneClick?.(url);
+}
 export function setupAccount(name, email, password) {
     return ipc().setupAccount?.(name, email, password);
 }

package/client/lib/mailxapi.js

@@ -1,6 +1,6 @@
 /**
  * mailxapi — IPC bridge injected into WebView by the Rust launcher.
- * Follows the msgapi pattern: callNode → Promise → _mailxapiResolve/Reject.
+ * Follows the msgapi pattern: callNode → Promise → _msgapiServiceResolve/Reject.
  *
  * When running in a browser (no IPC), this file is not loaded.
  * api-client.ts auto-detects and falls back to HTTP fetch.
@@ -31,8 +31,8 @@
         });
     }
 
-    // Called by Rust to resolve promises
-    window._mailxapiResolve = function(id, value) {
+    // Called by host (msger Rust / msgview preload) to resolve service-channel promises
+    window._msgapiServiceResolve = function(id, value) {
         var cb = _callbacks[id];
         if (!cb) return;
         delete _callbacks[id];
@@ -40,8 +40,8 @@
         cb.resolve(value);
     };
 
-    // Called by Rust to reject promises
-    window._mailxapiReject = function(id, error) {
+    // Called by host to reject service-channel promises
+    window._msgapiServiceReject = function(id, error) {
         var cb = _callbacks[id];
         if (!cb) return;
         delete _callbacks[id];
@@ -49,8 +49,8 @@
         cb.reject(new Error(error));
     };
 
-    // Called by Rust to push events (new mail, sync progress, etc.)
-    window._mailxapiEvent = function(event) {
+    // Called by host to push events (new mail, sync progress, etc.)
+    window._msgapiServiceEvent = function(event) {
         for (var i = 0; i < _eventHandlers.length; i++) {
             try { _eventHandlers[i](event); } catch(e) { /* ignore */ }
         }
@@ -109,6 +109,12 @@
         writeJsoncFile: function(name, content) {
             return callNode("writeJsoncFile", { name: name, content: content });
         },
+        readConfigHelp: function(name) {
+            return callNode("readConfigHelp", { name: name });
+        },
+        unsubscribeOneClick: function(url) {
+            return callNode("unsubscribeOneClick", { url: url });
+        },
         searchContacts: function(query) {
             return callNode("searchContacts", { query: query });
         },

package/client/styles/components.css

@@ -562,6 +562,88 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
     outline: 2px solid var(--color-accent);
     outline-offset: -1px;
 }
+.mailx-modal-input-error {
+    outline: 2px solid oklch(0.65 0.2 25) !important;
+    outline-offset: -1px;
+    background: color-mix(in oklch, oklch(0.65 0.2 25) 6%, var(--color-bg-surface));
+}
+.mailx-modal-input-error::selection {
+    background: oklch(0.65 0.2 25);
+    color: #fff;
+}
+
+/* Split content area — textarea on the left, help on the right */
+.mailx-modal-split {
+    display: grid;
+    grid-template-columns: minmax(0, 1fr) minmax(240px, 360px);
+    gap: var(--gap-md);
+    min-height: 0;
+
+    &:has(.mailx-help-collapsed) {
+        grid-template-columns: minmax(0, 1fr) auto;
+    }
+}
+@media (max-width: 900px) {
+    .mailx-modal-split { grid-template-columns: 1fr; }
+}
+.mailx-modal-split-left, .mailx-modal-split-right {
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+}
+
+.mailx-help-panel {
+    background: var(--color-bg-surface);
+    border: 1px solid var(--color-border);
+    border-radius: var(--radius-sm);
+    padding: var(--gap-sm);
+    overflow: auto;
+    max-height: 60vh;
+    font-size: var(--font-size-sm);
+    line-height: 1.4;
+
+    &.mailx-help-collapsed .mailx-help-body { display: none; }
+    &.mailx-help-collapsed { max-height: none; padding: 4px; }
+}
+.mailx-help-title { display: flex; align-items: center; justify-content: space-between; margin-bottom: var(--gap-xs); }
+.mailx-help-toggle {
+    background: none;
+    border: none;
+    color: var(--color-text);
+    font-weight: 600;
+    cursor: pointer;
+    font-size: var(--font-size-sm);
+    padding: 2px 4px;
+}
+.mailx-help-toggle:hover { background: var(--color-bg-hover); border-radius: var(--radius-sm); }
+
+.mailx-help-body {
+    & h1, & h2, & h3 { margin-top: var(--gap-sm); margin-bottom: 4px; font-size: 1em; }
+    & h1 { font-size: 1.1em; }
+    & p { margin: 4px 0; }
+    & ul { margin: 4px 0 4px var(--gap-md); padding: 0; }
+    & li { margin: 2px 0; }
+    & code {
+        font-family: var(--font-mono);
+        font-size: 0.9em;
+        background: var(--color-bg);
+        padding: 1px 4px;
+        border-radius: 3px;
+    }
+    & a { color: var(--color-accent); }
+}
+.mailx-help-code {
+    font-family: var(--font-mono);
+    font-size: 12px;
+    background: var(--color-bg);
+    border: 1px solid var(--color-border);
+    border-radius: var(--radius-sm);
+    padding: var(--gap-xs);
+    overflow-x: auto;
+    margin: 4px 0;
+    white-space: pre;
+}
+.mailx-help-code code { background: none; padding: 0; }
 .mailx-modal-error {
     color: oklch(0.65 0.2 25);
     font-size: var(--font-size-sm);
@@ -593,6 +675,39 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
     font-weight: 500;
 }
 .mailx-modal-btn-primary:hover { filter: brightness(1.1); }
+
+/* About dialog */
+.mailx-about { font-size: var(--font-size-sm); line-height: 1.5; }
+.mailx-about-dl {
+    display: grid;
+    grid-template-columns: auto 1fr;
+    gap: 4px var(--gap-md);
+    margin: 0;
+
+    & dt { color: var(--color-text-muted); font-weight: 500; }
+    & dd { margin: 0; word-break: break-word; }
+}
+.mailx-about-section {
+    font-weight: 600;
+    margin-top: var(--gap-sm);
+    color: var(--color-text-muted);
+    font-size: 0.8rem;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+}
+.mailx-about-accounts ul {
+    margin: 4px 0 0 var(--gap-md);
+    padding: 0;
+}
+.mailx-about-foot {
+    margin-top: var(--gap-sm);
+    padding-top: var(--gap-sm);
+    border-top: 1px solid var(--color-border);
+    color: var(--color-text-muted);
+    font-size: 0.8rem;
+    text-align: center;
+}
+
 .ml-subject {
     overflow: hidden;
     text-overflow: ellipsis;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.306",
+  "version": "1.0.310",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,8 @@
     "@bobfrankston/iflow-node": "^0.1.7",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.24",
-    "@bobfrankston/msger": "^0.1.327",
+    "@bobfrankston/msger": "^0.1.340",
+    "@bobfrankston/mailx-host": "^0.1.0",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -65,6 +66,7 @@
     "@bobfrankston/miscinfo": "file:../../projects/npm/miscinfo",
     "@bobfrankston/oauthsupport": "file:../../projects/oauth/oauthsupport",
     "@bobfrankston/msger": "file:../../utils/msgx/msger",
+    "@bobfrankston/mailx-host": "file:packages/mailx-host",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -86,7 +88,8 @@
       "@bobfrankston/iflow-node": "^0.1.7",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.24",
-      "@bobfrankston/msger": "^0.1.327",
+      "@bobfrankston/msger": "^0.1.340",
+      "@bobfrankston/mailx-host": "^0.1.0",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

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

@@ -48,6 +48,9 @@ export declare function getMessage(params: {
     deliveredTo: string;
     returnPath: string;
     listUnsubscribe: string;
+    listUnsubscribeMail: string;
+    listUnsubscribeHttp: string;
+    listUnsubscribeOneClick: boolean;
     emlPath: string;
     id: number;
     accountId: string;

package/packages/mailx-core/index.js

@@ -141,6 +141,9 @@ export async function getMessage(params) {
     let deliveredTo = "";
     let returnPath = "";
     let listUnsubscribe = "";
+    let listUnsubscribeMail = "";
+    let listUnsubscribeHttp = "";
+    let listUnsubscribeOneClick = false;
     const raw = await imapManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid);
     if (raw) {
         const parsed = await simpleParser(raw);
@@ -204,12 +207,9 @@ export async function getMessage(params) {
             }
         }
         returnPath = hdr("return-path").replace(/[<>]/g, "");
-        // mailparser merges List-* headers into a "list" object
-        const listHeaders = parsed.headers.get("list");
-        if (listHeaders?.unsubscribe) {
-            const unsub = listHeaders.unsubscribe;
-            listUnsubscribe = unsub.url || (unsub.mail ? `mailto:${unsub.mail}` : "");
-        }
+        ({ listUnsubscribeMail, listUnsubscribeHttp, listUnsubscribeOneClick } =
+            parseListUnsubscribe(parsed.headers));
+        listUnsubscribe = listUnsubscribeHttp || listUnsubscribeMail;
     }
     if (bodyHtml && !allowRemote) {
         const allowList = loadAllowlist();
@@ -231,7 +231,45 @@ export async function getMessage(params) {
     // Build .eml file path for "View Source"
     const storePath = getStorePath();
     const emlPath = `${storePath}/${accountId}/${envelope.folderId}/${envelope.uid}.eml`;
-    return { ...envelope, bodyHtml, bodyText, hasRemoteContent, remoteAllowed: allowRemote, attachments, deliveredTo, returnPath, listUnsubscribe, emlPath };
+    return { ...envelope, bodyHtml, bodyText, hasRemoteContent, remoteAllowed: allowRemote, attachments, deliveredTo, returnPath, listUnsubscribe, listUnsubscribeMail, listUnsubscribeHttp, listUnsubscribeOneClick, emlPath };
+}
+/** Parse `List-Unsubscribe` (RFC 2369) and `List-Unsubscribe-Post` (RFC 8058).
+ *  Returns mailto URL, HTTPS URL, and whether one-click POST is allowed.
+ *  mailparser only exposes ONE of mail/url even when both are present, so we
+ *  also scan the raw header text for the full set of angle-bracketed URIs. */
+function parseListUnsubscribe(headers) {
+    let mail = "";
+    let http = "";
+    let oneClick = false;
+    // Raw header scan — most reliable.
+    const raw = headers.get("list-unsubscribe");
+    const rawStr = typeof raw === "string" ? raw : (raw && typeof raw.text === "string" ? raw.text : "");
+    if (rawStr) {
+        const matches = rawStr.match(/<([^>]+)>/g) || [];
+        for (const m of matches) {
+            const url = m.slice(1, -1).trim();
+            if (!mail && /^mailto:/i.test(url))
+                mail = url;
+            else if (!http && /^https?:/i.test(url))
+                http = url;
+        }
+    }
+    // mailparser fallback — for builds where headers.get returns the parsed object.
+    if (!mail && !http) {
+        const listHeaders = headers.get("list");
+        if (listHeaders?.unsubscribe) {
+            const unsub = listHeaders.unsubscribe;
+            if (unsub.url)
+                http = Array.isArray(unsub.url) ? unsub.url[0] : unsub.url;
+            if (unsub.mail)
+                mail = `mailto:${Array.isArray(unsub.mail) ? unsub.mail[0] : unsub.mail}`;
+        }
+    }
+    const post = headers.get("list-unsubscribe-post");
+    const postStr = typeof post === "string" ? post : (post && typeof post.text === "string" ? post.text : "");
+    if (postStr && /one-?click/i.test(postStr))
+        oneClick = true;
+    return { listUnsubscribeMail: mail, listUnsubscribeHttp: http, listUnsubscribeOneClick: oneClick };
 }
 export async function updateFlags(params) {
     const envelope = db.getMessageByUid(params.accountId, params.uid);

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

@@ -0,0 +1,20 @@
+/**
+ * mailx-host — runtime WebView host selector.
+ *
+ * Today: msger on every platform.
+ * Future: lazy-load @bobfrankston/mailx-host-msgview for Mac and niche
+ * Linux systems that can't get webkit2gtk-4.1.
+ *
+ * Callers (bin/mailx.ts) import showMessageBox / showService / setAppName
+ * from here instead of @bobfrankston/msger directly, so the swap is a
+ * one-line change when msgview arrives.
+ */
+import * as msger from "@bobfrankston/msger";
+export type { MessageBoxOptions, MessageBoxResult, ServiceHandle } from "@bobfrankston/msger";
+export type HostName = "msger" | "msgview";
+export declare function selectHost(): HostName;
+export declare const showMessageBox: typeof msger.showMessageBox;
+export declare const showService: typeof msger.showService;
+export declare const setAppName: typeof msger.setAppName;
+export declare const hostName: HostName;
+//# sourceMappingURL=index.d.ts.map

package/packages/mailx-host/index.js

@@ -0,0 +1,30 @@
+/**
+ * mailx-host — runtime WebView host selector.
+ *
+ * Today: msger on every platform.
+ * Future: lazy-load @bobfrankston/mailx-host-msgview for Mac and niche
+ * Linux systems that can't get webkit2gtk-4.1.
+ *
+ * Callers (bin/mailx.ts) import showMessageBox / showService / setAppName
+ * from here instead of @bobfrankston/msger directly, so the swap is a
+ * one-line change when msgview arrives.
+ */
+import * as msger from "@bobfrankston/msger";
+export function selectHost() {
+    const requested = (process.env.MAILX_HOST || "").toLowerCase();
+    if (requested === "msger" || requested === "msgview")
+        return requested;
+    if (process.platform === "darwin")
+        return "msgview";
+    return "msger";
+}
+const _hostName = selectHost();
+if (_hostName !== "msger") {
+    throw new Error(`mailx-host: "${_hostName}" adapter not implemented yet — set MAILX_HOST=msger to fall back, ` +
+        `or implement @bobfrankston/mailx-host-msgview (see docs/host-abstraction-plan.md).`);
+}
+export const showMessageBox = msger.showMessageBox;
+export const showService = msger.showService;
+export const setAppName = msger.setAppName;
+export const hostName = _hostName;
+//# sourceMappingURL=index.js.map

package/packages/mailx-host/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@bobfrankston/mailx-host",
+  "version": "0.1.1",
+  "description": "Host abstraction for mailx — dispatches to msger or msgview",
+  "type": "module",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "release": "npmglobalize"
+  },
+  "license": "ISC",
+  "dependencies": {
+    "@bobfrankston/msger": "file:../../../../utils/msgx/msger"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:BobFrankston/mailx-host.git"
+  }
+}

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

@@ -15,6 +15,15 @@ export declare class MailxService {
     getUnifiedInbox(page?: number, pageSize?: number): any;
     getMessages(accountId: string, folderId: number, page?: number, pageSize?: number, sort?: string, sortDir?: string, search?: string, flaggedOnly?: boolean): any;
     getMessage(accountId: string, uid: number, allowRemote?: boolean, folderId?: number): Promise<any>;
+    /** RFC 8058 one-click unsubscribe: POST `List-Unsubscribe=One-Click` to the
+     *  HTTPS URL the message's List-Unsubscribe header advertised. Done server-
+     *  side because the unsubscribe endpoint usually doesn't set CORS headers,
+     *  so a browser-side fetch would be blocked. */
+    unsubscribeOneClick(url: string): Promise<{
+        ok: boolean;
+        status: number;
+        statusText: string;
+    }>;
     updateFlags(accountId: string, uid: number, flags: string[]): Promise<void>;
     allowRemoteContent(type: "sender" | "domain" | "recipient", value: string): Promise<void>;
     search(q: string, page?: number, pageSize?: number, scope?: string, accountId?: string, folderId?: number): Promise<any>;
@@ -67,6 +76,9 @@ export declare class MailxService {
      *  Names are whitelisted so the UI can't read arbitrary files.
      *  `config.jsonc` is the local per-machine config (not cloud-synced). */
     readJsoncFile(name: string): Promise<string | null>;
+    /** Return the help section for a named config file, extracted from docs/config-help.md.
+     *  Matches a level-2 heading whose text equals the filename. Returns markdown. */
+    readConfigHelp(name: string): Promise<string>;
     /** Write a JSONC config file. Validates that the content parses as JSONC
      *  (loosely — strips comments/trailing commas) before writing. */
     writeJsoncFile(name: string, content: string): Promise<void>;

package/packages/mailx-service/index.js

@@ -6,9 +6,46 @@
 import * as dns from "node:dns/promises";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, getStorePath, getStorageInfo, getConfigDir } from "@bobfrankston/mailx-settings";
 import { sanitizeHtml, encodeQuotedPrintable } from "@bobfrankston/mailx-types";
 import { simpleParser } from "mailparser";
+/** Parse `List-Unsubscribe` (RFC 2369) and `List-Unsubscribe-Post` (RFC 8058).
+ *  mailparser only exposes ONE of mail/url even when both are present, so we
+ *  also scan the raw header text for the full set of angle-bracketed URIs. */
+function parseListUnsubscribe(headers) {
+    let mail = "";
+    let http = "";
+    let oneClick = false;
+    const raw = headers.get("list-unsubscribe");
+    const rawStr = typeof raw === "string" ? raw : (raw && typeof raw.text === "string" ? raw.text : "");
+    if (rawStr) {
+        const matches = rawStr.match(/<([^>]+)>/g) || [];
+        for (const m of matches) {
+            const url = m.slice(1, -1).trim();
+            if (!mail && /^mailto:/i.test(url))
+                mail = url;
+            else if (!http && /^https?:/i.test(url))
+                http = url;
+        }
+    }
+    if (!mail && !http) {
+        const listHeaders = headers.get("list");
+        if (listHeaders?.unsubscribe) {
+            const unsub = listHeaders.unsubscribe;
+            if (unsub.url)
+                http = Array.isArray(unsub.url) ? unsub.url[0] : unsub.url;
+            if (unsub.mail)
+                mail = `mailto:${Array.isArray(unsub.mail) ? unsub.mail[0] : unsub.mail}`;
+        }
+    }
+    const post = headers.get("list-unsubscribe-post");
+    const postStr = typeof post === "string" ? post : (post && typeof post.text === "string" ? post.text : "");
+    if (postStr && /one-?click/i.test(postStr))
+        oneClick = true;
+    return { listUnsubscribeMail: mail, listUnsubscribeHttp: http, listUnsubscribeOneClick: oneClick };
+}
 // ── Email provider detection (MX-based) ──
 const GOOGLE_DOMAINS = ["gmail.com", "googlemail.com"];
 const MS_DOMAINS = ["outlook.com", "hotmail.com", "live.com"];
@@ -161,6 +198,9 @@ export class MailxService {
         let deliveredTo = "";
         let returnPath = "";
         let listUnsubscribe = "";
+        let listUnsubscribeMail = "";
+        let listUnsubscribeHttp = "";
+        let listUnsubscribeOneClick = false;
         if (raw) {
             const parsed2 = await simpleParser(raw);
             const hdr = (key) => {
@@ -211,19 +251,32 @@ export class MailxService {
                 }
             }
             returnPath = hdr("return-path").replace(/[<>]/g, "");
-            const listHeaders = parsed2.headers.get("list");
-            if (listHeaders?.unsubscribe) {
-                const unsub = listHeaders.unsubscribe;
-                listUnsubscribe = unsub.url || (unsub.mail ? `mailto:${unsub.mail}` : "");
-            }
+            ({ listUnsubscribeMail, listUnsubscribeHttp, listUnsubscribeOneClick } =
+                parseListUnsubscribe(parsed2.headers));
+            listUnsubscribe = listUnsubscribeHttp || listUnsubscribeMail;
         }
         const storePath = getStorePath();
         const emlPath = path.join(storePath, accountId, String(envelope.folderId), `${envelope.uid}.eml`);
         return {
             ...envelope, bodyHtml, bodyText, hasRemoteContent, remoteAllowed: allowRemote,
-            attachments, emlPath, deliveredTo, returnPath, listUnsubscribe,
+            attachments, emlPath, deliveredTo, returnPath,
+            listUnsubscribe, listUnsubscribeMail, listUnsubscribeHttp, listUnsubscribeOneClick,
         };
     }
+    /** RFC 8058 one-click unsubscribe: POST `List-Unsubscribe=One-Click` to the
+     *  HTTPS URL the message's List-Unsubscribe header advertised. Done server-
+     *  side because the unsubscribe endpoint usually doesn't set CORS headers,
+     *  so a browser-side fetch would be blocked. */
+    async unsubscribeOneClick(url) {
+        if (!/^https:\/\//i.test(url))
+            throw new Error("one-click unsubscribe requires an https URL");
+        const resp = await fetch(url, {
+            method: "POST",
+            headers: { "Content-Type": "application/x-www-form-urlencoded" },
+            body: "List-Unsubscribe=One-Click",
+        });
+        return { ok: resp.ok, status: resp.status, statusText: resp.statusText };
+    }
     async updateFlags(accountId, uid, flags) {
         const envelope = this.db.getMessageByUid(accountId, uid);
         await this.imapManager.updateFlagsLocal(accountId, uid, envelope?.folderId || 0, flags);
@@ -677,6 +730,45 @@ export class MailxService {
         const { cloudRead } = await import("@bobfrankston/mailx-settings");
         return cloudRead(name);
     }
+    /** Return the help section for a named config file, extracted from docs/config-help.md.
+     *  Matches a level-2 heading whose text equals the filename. Returns markdown. */
+    async readConfigHelp(name) {
+        const WHITELIST = ["accounts.jsonc", "allowlist.jsonc", "clients.jsonc", "config.jsonc"];
+        if (!WHITELIST.includes(name))
+            return "";
+        // Look in the repo root (dev) and in the installed package dir (production).
+        const candidates = [
+            path.join(__dirname, "..", "..", "docs", "config-help.md"),
+            path.join(__dirname, "config-help.md"),
+        ];
+        let md = "";
+        for (const p of candidates) {
+            try {
+                md = fs.readFileSync(p, "utf-8");
+                break;
+            }
+            catch { /* try next */ }
+        }
+        if (!md)
+            return "";
+        const lines = md.split(/\r?\n/);
+        let inSection = false;
+        const out = [];
+        for (const line of lines) {
+            const h2 = /^##\s+(.+?)\s*$/.exec(line);
+            if (h2) {
+                if (inSection)
+                    break; // next section — stop
+                if (h2[1].trim() === name) {
+                    inSection = true;
+                    continue;
+                }
+            }
+            if (inSection)
+                out.push(line);
+        }
+        return out.join("\n").trim();
+    }
     /** Write a JSONC config file. Validates that the content parses as JSONC
      *  (loosely — strips comments/trailing commas) before writing. */
     async writeJsoncFile(name, content) {

package/packages/mailx-service/jsonrpc.js

@@ -105,6 +105,10 @@ async function dispatchAction(svc, action, p) {
         case "writeJsoncFile":
             await svc.writeJsoncFile(p.name, p.content);
             return { ok: true };
+        case "readConfigHelp":
+            return { content: await svc.readConfigHelp(p.name) };
+        case "unsubscribeOneClick":
+            return await svc.unsubscribeOneClick(p.url);
         // Settings
         case "getSettings":
             return svc.getSettings();

package/packages/mailx-store/db.js

@@ -270,7 +270,7 @@ export class MailxDB {
     }
     getFolders(accountId) {
         const rows = this.db.prepare("SELECT * FROM folders WHERE account_id = ? ORDER BY path").all(accountId);
-        return rows.map(r => ({
+        const folders = rows.map(r => ({
             id: r.id,
             accountId: r.account_id,
             path: r.path,
@@ -281,6 +281,35 @@ export class MailxDB {
             unreadCount: r.unread_count,
             children: []
         }));
+        // Sub-folder inheritance: a folder under Drafts/Sent/Trash/Junk/Archive
+        // inherits the parent's special role for UI purposes (column layout,
+        // open-in-compose, etc.). INBOX is intentionally excluded — its sub-
+        // folders are typically filtered mail and inheriting "inbox" would
+        // inflate All Inboxes. findFolder() still resolves to the canonical
+        // folder because rows are sorted by path and the parent sorts before
+        // its children.
+        const INHERITABLE = new Set(["sent", "drafts", "trash", "junk", "archive"]);
+        const roleByPath = new Map();
+        for (const f of folders) {
+            if (f.specialUse && INHERITABLE.has(f.specialUse)) {
+                roleByPath.set(f.path, f.specialUse);
+            }
+        }
+        for (const f of folders) {
+            if (f.specialUse)
+                continue;
+            const delim = f.delimiter || "/";
+            const parts = f.path.split(delim);
+            while (parts.length > 1) {
+                parts.pop();
+                const role = roleByPath.get(parts.join(delim));
+                if (role) {
+                    f.specialUse = role;
+                    break;
+                }
+            }
+        }
+        return folders;
     }
     deleteFolder(folderId) {
         this.db.prepare("DELETE FROM messages WHERE folder_id = ?").run(folderId);
@@ -313,10 +342,23 @@ export class MailxDB {
             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 = ?
-            `).run(JSON.stringify(msg.flags), msg.preview, msg.bodyPath, Date.now(), existing.id);
+            // Only overwrite body_path / preview when the caller actually has a
+            // body. Metadata-only syncs (Gmail API storeApiMessages, IMAP
+            // header-only fetches) pass bodyPath: "" and would otherwise wipe
+            // the path that prefetch just wrote, causing prefetch to re-download
+            // every message every cycle.
+            if (msg.bodyPath) {
+                this.db.prepare(`
+                    UPDATE messages SET flags_json = ?, preview = ?, body_path = ?, cached_at = ?
+                    WHERE id = ?
+                `).run(JSON.stringify(msg.flags), msg.preview, msg.bodyPath, Date.now(), existing.id);
+            }
+            else {
+                this.db.prepare(`
+                    UPDATE messages SET flags_json = ?, cached_at = ?
+                    WHERE id = ?
+                `).run(JSON.stringify(msg.flags), Date.now(), existing.id);
+            }
             return existing.id;
         }
         const toText = msg.to.map(a => `${a.name} ${a.address}`).join(" ");