@bobfrankston/mailx 1.0.14 → 1.0.15

package/README.md

@@ -1,7 +1,11 @@
-# mailx — Email Client
+# mailx -- Email Client
 
 A local-first email client with IMAP sync, full offline reading, and a standalone native app. Replaces Thunderbird/Outlook.
 
+> **Disclaimer:** This is a personal project written for my own use. I provide it as-is with no promises of support, stability, or fitness for any particular purpose. Use at your own risk.
+
+MIT License -- Copyright (c) 2026 Bob Frankston
+
 ## Quick Start
 
 ```bash
@@ -14,7 +18,7 @@ launch.ps1 -restart        # Kill existing server and restart
 
 ## Setup
 
-### 1. Config Pointer (~/.mailx/config.json)
+### 1. Config Pointer (~/.mailx/config.jsonc)
 
 Points to the shared settings file and local store:
 
@@ -28,7 +32,7 @@ Points to the shared settings file and local store:
 - **settingsPath** — Path to shared settings (can be on OneDrive/Dropbox for multi-machine sync)
 - **storePath** — Where cached message bodies are stored (local, not synced)
 
-If `config.json` doesn't exist, settings default to `~/.mailx/settings.jsonc`.
+If `config.jsonc` doesn't exist, settings default to `~/.mailx/settings.jsonc`.
 
 ### 2. Settings File (settings.jsonc)
 
@@ -167,7 +171,7 @@ All data lives in `~/.mailx/` (e.g., `C:\Users\You\.mailx\`):
 
 | File | Shared? | Purpose |
 |------|---------|---------|
-| config.json | No | Points to shared settings dir + local overrides |
+| config.jsonc | No | Points to shared settings dir + local overrides |
 | accounts.jsonc | Yes | IMAP/SMTP account configs |
 | preferences.jsonc | Yes | UI, sync, font settings |
 | allowlist.jsonc | Yes | Remote content sender/domain allow-list |
@@ -177,7 +181,7 @@ All data lives in `~/.mailx/` (e.g., `C:\Users\You\.mailx\`):
 | window.json | No | Window position (per machine) |
 | mailx-YYYY-MM-DD.log | No | Server log (auto-deleted after 7 days) |
 
-**Shared** files can live on OneDrive/Dropbox — `config.json` points to the shared directory. **Local** files stay on the machine.
+**Shared** files can live on OneDrive/Dropbox — `config.jsonc` points to the shared directory. **Local** files stay on the machine.
 
 ### Safe to Delete
 
@@ -186,7 +190,7 @@ All data lives in `~/.mailx/` (e.g., `C:\Users\You\.mailx\`):
 - **mailx-*.log** — auto-cleaned after 7 days. Safe to delete anytime.
 - **window.json** — resets window position to default 1280×800.
 
-### config.json
+### config.jsonc
 
 ```json
 {
@@ -200,7 +204,7 @@ All data lives in `~/.mailx/` (e.g., `C:\Users\You\.mailx\`):
 - **storePath** — where cached .eml files are stored
 - **historyDays** — per-machine override for sync history (shared default is 30)
 
-If `config.json` doesn't exist, all settings default to `~/.mailx/`.
+If `config.jsonc` doesn't exist, all settings default to `~/.mailx/`.
 
 ## Architecture
 

package/client/app.js

@@ -13,6 +13,8 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
     currentFolderSpecialUse = specialUse;
     currentAccountId = accountId;
     currentFolderId = folderId;
+    if (searchInput)
+        searchInput.value = "";
     loadMessages(accountId, folderId, 1, specialUse);
     document.title = `mailx - ${folderName}`;
 }, () => {
@@ -210,15 +212,28 @@ document.getElementById("btn-forward")?.addEventListener("click", () => openComp
 let searchTimeout;
 const searchInput = document.getElementById("search-input");
 const searchScope = document.getElementById("search-scope");
-function doSearch() {
+function doSearch(immediate = false) {
     const query = searchInput.value.trim();
-    if (query.length < 2) {
-        if (query.length === 0)
-            reloadCurrentFolder();
+    if (query.length === 0) {
+        reloadCurrentFolder();
         return;
     }
+    if (query.length < 2 && !immediate)
+        return;
     const scope = searchScope?.value || "all";
-    // For "current" and "server" scopes, pass the active folder context
+    // "This folder" scope: instant client-side filter on debounce, server search on Enter
+    if (scope === "current" && !immediate) {
+        // Client-side filter of visible rows
+        const body = document.getElementById("ml-body");
+        if (body) {
+            const lower = query.toLowerCase();
+            for (const row of body.querySelectorAll(".ml-row")) {
+                const text = row.textContent?.toLowerCase() || "";
+                row.classList.toggle("filter-hidden", !text.includes(lower));
+            }
+        }
+        return;
+    }
     loadSearchResults(query, scope, currentAccountId, currentFolderId);
     document.title = `mailx - Search: ${query}`;
 }
@@ -227,15 +242,19 @@ let currentAccountId = "";
 let currentFolderId = 0;
 searchInput?.addEventListener("input", () => {
     clearTimeout(searchTimeout);
-    searchTimeout = setTimeout(doSearch, 400);
+    searchTimeout = setTimeout(() => doSearch(false), 300);
 });
 searchInput?.addEventListener("keydown", (e) => {
     if (e.key === "Enter") {
         clearTimeout(searchTimeout);
-        doSearch();
+        doSearch(true);
     }
     if (e.key === "Escape") {
         searchInput.value = "";
+        // Clear any client-side filters
+        const body = document.getElementById("ml-body");
+        if (body)
+            body.querySelectorAll(".filter-hidden").forEach(r => r.classList.remove("filter-hidden"));
         reloadCurrentFolder();
     }
 });

package/client/components/message-list.js

@@ -3,11 +3,6 @@
  * Loads more messages on scroll.
  */
 import { getMessages, getUnifiedInbox, searchMessages } from "../lib/api-client.js";
-function clearFilter() {
-    const f = document.getElementById("ml-filter-input");
-    if (f)
-        f.value = "";
-}
 /** Clear the message viewer when no message is selected */
 function clearViewer() {
     const bodyEl = document.getElementById("mv-body");
@@ -64,26 +59,6 @@ const dateFmt = { year: "numeric", month: "short", day: "numeric", hour: "2-digi
 const dateFmtSameYear = { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", hour12: false };
 export function initMessageList(handler) {
     onMessageSelect = handler;
-    // Client-side filter
-    const filterInput = document.getElementById("ml-filter-input");
-    if (filterInput) {
-        filterInput.addEventListener("input", () => {
-            const query = filterInput.value.toLowerCase();
-            const body = document.getElementById("ml-body");
-            if (!body)
-                return;
-            for (const row of body.querySelectorAll(".ml-row")) {
-                const text = row.textContent?.toLowerCase() || "";
-                row.classList.toggle("filter-hidden", query.length > 0 && !text.includes(query));
-            }
-        });
-        filterInput.addEventListener("keydown", (e) => {
-            if (e.key === "Escape") {
-                filterInput.value = "";
-                filterInput.dispatchEvent(new Event("input"));
-            }
-        });
-    }
     // Infinite scroll
     const body = document.getElementById("ml-body");
     if (body) {
@@ -97,21 +72,20 @@ export function initMessageList(handler) {
         });
     }
 }
-/** Reload the currently displayed folder */
+/** Reload the currently displayed folder (preserves current selection) */
 export function reloadCurrentFolder() {
     if (searchMode) {
         loadSearchResults(currentSearchQuery);
     }
     else if (unifiedMode) {
-        loadUnifiedInbox();
+        loadUnifiedInbox(false);
     }
     else if (currentAccountId && currentFolderId) {
-        loadMessages(currentAccountId, currentFolderId);
+        loadMessages(currentAccountId, currentFolderId, 1, "", false);
     }
 }
 /** Load unified inbox (all accounts) */
-export async function loadUnifiedInbox() {
-    clearFilter();
+export async function loadUnifiedInbox(autoSelect = true) {
     unifiedMode = true;
     currentPage = 1;
     totalMessages = 0;
@@ -129,9 +103,11 @@ export async function loadUnifiedInbox() {
         }
         body.innerHTML = "";
         appendMessages(body, "", result.items);
-        const firstRow = body.querySelector(".ml-row");
-        if (firstRow)
-            firstRow.click();
+        if (autoSelect) {
+            const firstRow = body.querySelector(".ml-row");
+            if (firstRow)
+                firstRow.click();
+        }
     }
     catch (e) {
         if (e.name === "AbortError")
@@ -141,7 +117,6 @@ export async function loadUnifiedInbox() {
 }
 /** Load search results */
 export async function loadSearchResults(query, scope = "all", accountId = "", folderId = 0) {
-    clearFilter();
     searchMode = true;
     unifiedMode = false;
     currentSearchQuery = query;
@@ -193,8 +168,7 @@ export async function loadSearchResults(query, scope = "all", accountId = "", fo
         body.innerHTML = `<div class="ml-empty">Search error: ${e.message}</div>`;
     }
 }
-export async function loadMessages(accountId, folderId, page = 1, specialUse = "") {
-    clearFilter();
+export async function loadMessages(accountId, folderId, page = 1, specialUse = "", autoSelect = true) {
     searchMode = false;
     unifiedMode = false;
     showToInsteadOfFrom = ["sent", "drafts", "outbox"].includes(specialUse) ||
@@ -221,10 +195,12 @@ export async function loadMessages(accountId, folderId, page = 1, specialUse = "
         }
         body.innerHTML = "";
         appendMessages(body, accountId, result.items);
-        // Auto-select first message
-        const firstRow = body.querySelector(".ml-row");
-        if (firstRow)
-            firstRow.click();
+        // Auto-select first message only on explicit folder navigation, not sync reload
+        if (autoSelect) {
+            const firstRow = body.querySelector(".ml-row");
+            if (firstRow)
+                firstRow.click();
+        }
     }
     catch (e) {
         if (e.name === "AbortError")

package/client/components/message-viewer.js

@@ -42,13 +42,12 @@ export async function showMessage(accountId, uid, folderId, specialUse) {
         headerEl.querySelector(".mv-date").textContent = new Date(msg.date).toLocaleString(undefined, { year: "numeric", month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", hour12: false });
         // Unsubscribe button (upper right of header)
         const unsubBtn = document.getElementById("mv-unsubscribe");
-        const headerUnsub = msg.listUnsubscribe || "";
-        const headerUnsubUrl = headerUnsub.match(/<(https?:\/\/[^>]+)>/)?.[1]
-            || headerUnsub.match(/<(mailto:[^>]+)>/)?.[1] || "";
+        // listUnsubscribe is now a clean URL (https:// or mailto:) from the server
+        const unsubUrl = msg.listUnsubscribe || "";
         if (unsubBtn) {
-            if (headerUnsubUrl) {
+            if (unsubUrl) {
                 unsubBtn.hidden = false;
-                unsubBtn.href = headerUnsubUrl;
+                unsubBtn.href = unsubUrl;
                 unsubBtn.target = "_blank";
                 unsubBtn.rel = "noopener noreferrer";
             }
@@ -202,7 +201,8 @@ export async function showMessage(accountId, uid, folderId, specialUse) {
         else if (msg.bodyText) {
             const pre = document.createElement("pre");
             pre.style.cssText = "padding: 1rem; white-space: pre-wrap; word-break: break-word;";
-            pre.textContent = msg.bodyText;
+            // Auto-linkify URLs in plain text
+            pre.innerHTML = linkifyText(msg.bodyText);
             bodyEl.appendChild(pre);
         }
         else {
@@ -221,7 +221,9 @@ export async function showMessage(accountId, uid, folderId, specialUse) {
         }
     }
     catch (e) {
-        bodyEl.innerHTML = `<div class="mv-empty">Error: ${e.message}</div>`;
+        const msg = e.message || "Unknown error";
+        bodyEl.innerHTML = `<div class="mv-empty">Failed to load message: ${msg}<br><button onclick="location.reload()">Retry</button></div>`;
+        console.error("showMessage error:", e);
     }
 }
 function formatAddr(addr) {
@@ -229,6 +231,13 @@ function formatAddr(addr) {
         return `${addr.name} <${addr.address}>`;
     return addr.address;
 }
+/** Convert plain text URLs into clickable links, escaping HTML */
+function linkifyText(text) {
+    // Escape HTML first
+    const escaped = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    // Then linkify URLs
+    return escaped.replace(/(https?:\/\/[^\s<>"')\]]+)/g, '<a href="$1" target="_blank" rel="noopener noreferrer">$1</a>');
+}
 function escapeText(s) {
     const div = document.createElement("div");
     div.textContent = s;

package/client/index.html

@@ -73,9 +73,6 @@
 
     <main class="main-area">
         <section class="message-list" id="message-list">
-            <div class="ml-filter">
-                <input type="text" id="ml-filter-input" placeholder="Filter..." autocomplete="off">
-            </div>
             <div class="ml-header">
                 <span class="ml-col ml-col-flag"></span>
                 <span class="ml-col ml-col-from" data-sort="from">From</span>

package/client/styles/components.css

@@ -92,7 +92,7 @@
     background: var(--color-bg-surface);
     color: var(--color-text);
     font-size: var(--font-size-sm);
-    width: 200px;
+    width: 350px;
 
     &::placeholder { color: var(--color-text-muted); }
     &:focus { outline: 1px solid var(--color-accent); border-color: var(--color-accent); }
@@ -218,7 +218,7 @@
 .message-list {
     display: grid;
     grid-template-columns: 1.2em minmax(120px, 200px) auto 1fr;
-    grid-template-rows: auto auto 1fr;
+    grid-template-rows: auto 1fr;
     column-gap: var(--gap-sm);
     overflow: hidden;
     border-right: 1px solid var(--color-border);
@@ -244,28 +244,6 @@
     font-size: var(--font-size-sm);
 }
 
-.ml-filter {
-    grid-column: 1 / -1;
-    padding: 2px var(--gap-xs);
-    border-bottom: 1px solid var(--color-border);
-    background: var(--color-bg-surface);
-}
-
-.ml-filter input {
-    width: 100%;
-    padding: 2px var(--gap-sm);
-    border: 1px solid var(--color-border);
-    border-radius: var(--radius-sm);
-    background: var(--color-bg);
-    color: var(--color-text);
-    font-size: var(--font-size-sm);
-    outline: none;
-}
-
-.ml-filter input:focus {
-    border-color: var(--color-accent);
-}
-
 .ml-row.filter-hidden { display: none; }
 
 .ml-header {

package/launcher/builder/postinstall.js

@@ -1,81 +1,21 @@
 #!/usr/bin/env node
 /**
- * Post-install script to set executable permissions on Linux/Mac binaries
- * and check for required system dependencies (webkit2gtk on Linux).
+ * mailx postinstall — delegates to @bobfrankston/rust-builder
  */
-
-import fs from "fs";
+import { runPostinstall } from "@bobfrankston/rust-builder/postinstall";
 import path from "path";
-import { execSync } from "child_process";
-
-function detectDistro() {
-    if (!fs.existsSync("/etc/os-release")) return "unknown";
-    try {
-        const osRelease = fs.readFileSync("/etc/os-release", "utf8").toLowerCase();
-        if (osRelease.includes("ubuntu") || osRelease.includes("debian")) return "debian";
-        if (osRelease.includes("fedora") || osRelease.includes("rhel") || osRelease.includes("centos")) return "fedora";
-        if (osRelease.includes("arch")) return "arch";
-        return "unknown";
-    } catch { return "unknown"; }
-}
-
-function showDependencyHelp(distro) {
-    console.warn("\n  Missing system dependencies for mailx native launcher.");
-    console.warn("  Install required libraries:\n");
-    switch (distro) {
-        case "debian": console.warn("    sudo apt install libwebkit2gtk-4.1-0 libgtk-3-0\n"); break;
-        case "fedora": console.warn("    sudo dnf install webkit2gtk4.1 gtk3\n"); break;
-        case "arch": console.warn("    sudo pacman -S webkit2gtk-4.1 gtk3\n"); break;
-        default: console.warn("    Install webkit2gtk-4.1 and gtk3 for your distribution\n");
-    }
-}
-
-function main() {
-    if (process.platform === "win32") return;
-
-    const binDir = path.join(import.meta.dirname, "..", "bin");
-    const arch = process.arch;
-
-    // Binary naming convention (matches msger pattern):
-    //   Windows:      mailx-app.exe
-    //   macOS x64:    mailx-app
-    //   macOS arm64:  mailx-app-arm64
-    //   Linux x64:    mailx-app-linux
-    //   Linux arm64:  mailx-app-linux-aarch64
-    let binaryName;
-    if (process.platform === "darwin") {
-        binaryName = arch === "arm64" ? "mailx-app-arm64" : "mailx-app";
-    } else {
-        binaryName = arch === "arm64" ? "mailx-app-linux-aarch64" : "mailx-app-linux";
-    }
-
-    const binaryPath = path.join(binDir, binaryName);
-
-    if (!fs.existsSync(binaryPath)) {
-        console.warn(`  mailx native launcher not available for ${process.platform} ${arch}`);
-        console.warn("  mailx will run in browser mode (server + open browser)");
-        return;
-    }
-
-    // Set executable permissions
-    try {
-        fs.chmodSync(binaryPath, 0o755);
-        console.log(`  Set execute permissions on ${binaryName}`);
-    } catch (e) {
-        console.warn(`  Could not chmod ${binaryPath}: ${e.message}`);
-    }
-
-    // Check system dependencies on Linux
-    if (process.platform === "linux") {
-        try {
-            const ldd = execSync(`ldd "${binaryPath}" 2>&1`, { encoding: "utf8" });
-            if (ldd.includes("not found")) {
-                showDependencyHelp(detectDistro());
-            }
-        } catch {
-            console.warn("  Could not check system dependencies");
-        }
-    }
-}
-
-main();
+import { fileURLToPath } from "url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+runPostinstall({
+    binaryName: "mailx-app",
+    binDir: path.join(__dirname, "..", "bin"),
+    binaries: {
+        win32: "mailx-app.exe",
+        darwin: "mailx-app",
+        darwinArm64: "mailx-app-arm64",
+        linux: "mailx-app-linux",
+        linuxArm64: "mailx-app-linux-aarch64",
+    },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -23,6 +23,7 @@
     "@bobfrankston/iflow": "^1.0.2",
     "@bobfrankston/miscinfo": "^1.0.5",
     "@bobfrankston/oauthsupport": "^1.0.10",
+    "@bobfrankston/rust-builder": "^0.1.1",
     "mailparser": "^3.7.2",
     "quill": "^2.0.3",
     "express": "^4.21.0",
@@ -51,6 +52,7 @@
     "@bobfrankston/iflow": "file:../MailApps/iflow",
     "@bobfrankston/miscinfo": "file:../../projects/npm/miscinfo",
     "@bobfrankston/oauthsupport": "file:../../projects/oauth/oauthsupport",
+    "@bobfrankston/rust-builder": "file:../../utils/rust-builder",
     "mailparser": "^3.7.2",
     "quill": "^2.0.3",
     "express": "^4.21.0",

package/packages/mailx-api/index.js

@@ -90,7 +90,15 @@ export function createApiRouter(db, imapManager) {
             let hasRemoteContent = false;
             let attachments = [];
             const t0 = Date.now();
-            const raw = await imapManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid);
+            let raw = null;
+            try {
+                raw = await imapManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid);
+            }
+            catch (fetchErr) {
+                console.error(`  [fetch] Failed UID ${uid}: ${fetchErr.message || fetchErr}`);
+                // Return envelope with error instead of 500 — user can still see headers
+                return res.json({ ...envelope, bodyHtml: "", bodyText: `[Message body unavailable: ${fetchErr.message || "IMAP connection failed"}]`, hasRemoteContent: false, remoteAllowed: false, attachments: [], emlPath: "", deliveredTo: "", returnPath: "", listUnsubscribe: "" });
+            }
             const t1 = Date.now();
             if (raw) {
                 const parsed = await simpleParser(raw);
@@ -135,20 +143,31 @@ export function createApiRouter(db, imapManager) {
             if (raw) {
                 const parsed2 = await simpleParser(raw);
                 const hdr = (key) => {
-                    const v = parsed2.headers.get(key);
+                    let v = parsed2.headers.get(key);
                     if (!v)
                         return "";
+                    if (Array.isArray(v))
+                        v = v[0];
                     if (typeof v === "string")
                         return v;
-                    if (typeof v === "object" && "text" in v)
-                        return v.text || "";
-                    if (typeof v === "object" && "value" in v)
-                        return String(v.value);
+                    if (typeof v === "object" && v !== null) {
+                        if ("text" in v)
+                            return v.text || "";
+                        if ("value" in v)
+                            return String(v.value);
+                        if ("address" in v)
+                            return v.address || "";
+                    }
                     return String(v);
                 };
                 deliveredTo = hdr("delivered-to");
                 returnPath = hdr("return-path").replace(/[<>]/g, "");
-                listUnsubscribe = hdr("list-unsubscribe");
+                // mailparser merges List-* headers into a "list" object
+                const listHeaders = parsed2.headers.get("list");
+                if (listHeaders?.unsubscribe) {
+                    const unsub = listHeaders.unsubscribe;
+                    listUnsubscribe = unsub.url || (unsub.mail ? `mailto:${unsub.mail}` : "");
+                }
             }
             const message = {
                 ...envelope,
@@ -397,6 +416,18 @@ export function createApiRouter(db, imapManager) {
             res.status(500).json({ error: e.message });
         }
     });
+    // ── Direct IMAP delete (for messages not in local DB) ──
+    router.delete("/imap/:accountId/:folderPath/:uid", async (req, res) => {
+        try {
+            const { accountId, uid } = req.params;
+            const folderPath = decodeURIComponent(req.params.folderPath);
+            await imapManager.deleteOnServer(accountId, folderPath, Number(uid));
+            res.json({ ok: true });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
     // ── Drafts ──
     router.post("/draft", async (req, res) => {
         try {

package/packages/mailx-core/index.js

@@ -154,20 +154,31 @@ export async function getMessage(params) {
         }));
         // Extract useful headers for the UI
         const hdr = (key) => {
-            const v = parsed.headers.get(key);
+            let v = parsed.headers.get(key);
             if (!v)
                 return "";
+            if (Array.isArray(v))
+                v = v[0];
             if (typeof v === "string")
                 return v;
-            if (typeof v === "object" && "text" in v)
-                return v.text || "";
-            if (typeof v === "object" && "value" in v)
-                return String(v.value);
+            if (typeof v === "object" && v !== null) {
+                if ("text" in v)
+                    return v.text || "";
+                if ("value" in v)
+                    return String(v.value);
+                if ("address" in v)
+                    return v.address || "";
+            }
             return String(v);
         };
         deliveredTo = hdr("delivered-to");
         returnPath = hdr("return-path").replace(/[<>]/g, "");
-        listUnsubscribe = hdr("list-unsubscribe");
+        // 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}` : "");
+        }
     }
     if (bodyHtml && !allowRemote) {
         const allowList = loadAllowlist();

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

@@ -30,6 +30,8 @@ export declare class ImapManager extends EventEmitter {
     constructor(db: MailxDB);
     /** Get OAuth access token for an account (for SMTP auth) */
     getOAuthToken(accountId: string): Promise<string | null>;
+    /** Delete a message directly on the IMAP server (for stuck outbox messages not in local DB) */
+    deleteOnServer(accountId: string, folderPath: string, uid: number): Promise<void>;
     /** Search messages on the IMAP server — returns matching UIDs */
     searchOnServer(accountId: string, mailboxPath: string, criteria: any): Promise<number[]>;
     /** Create a fresh ImapClient for an account (disposable, single-use) */

package/packages/mailx-imap/index.js

@@ -62,6 +62,20 @@ export class ImapManager extends EventEmitter {
             return null;
         return config.tokenProvider();
     }
+    /** Delete a message directly on the IMAP server (for stuck outbox messages not in local DB) */
+    async deleteOnServer(accountId, folderPath, uid) {
+        const client = this.createClient(accountId);
+        try {
+            await client.deleteMessageByUid(folderPath, uid);
+            console.log(`  Deleted UID ${uid} from ${folderPath} on server`);
+        }
+        finally {
+            try {
+                await client.logout();
+            }
+            catch { /* ignore */ }
+        }
+    }
     /** Search messages on the IMAP server — returns matching UIDs */
     async searchOnServer(accountId, mailboxPath, criteria) {
         const client = this.createClient(accountId);
@@ -281,9 +295,12 @@ export class ImapManager extends EventEmitter {
         for (const [accountId] of this.configs) {
             let client = null;
             try {
-                // Fresh client for folder list
+                // Fresh client for folder list (30s timeout)
                 client = this.createClient(accountId);
-                const folders = await this.syncFolders(accountId, client);
+                const folders = await Promise.race([
+                    this.syncFolders(accountId, client),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error("Folder list timeout (30s)")), 30000))
+                ]);
                 await client.logout();
                 client = null;
                 // INBOX first so it's available fastest
@@ -294,11 +311,14 @@ export class ImapManager extends EventEmitter {
                         return 1;
                     return 0;
                 });
-                // Fresh client per folder — IMAP connections drop mid-sync on large accounts
+                // Fresh client per folder with 60s timeout — IMAP connections can hang
                 for (const folder of folders) {
                     try {
                         client = this.createClient(accountId);
-                        await this.syncFolder(accountId, folder.id, client);
+                        await Promise.race([
+                            this.syncFolder(accountId, folder.id, client),
+                            new Promise((_, reject) => setTimeout(() => reject(new Error("Sync timeout (60s)")), 60000))
+                        ]);
                         await client.logout();
                         client = null;
                     }