@bobfrankston/mailx 1.0.265 → 1.0.278

package/bin/mailx.js

@@ -463,16 +463,18 @@ async function promptForAccount(intro) {
         smtp: { host: smtpHost },
     };
 }
-/** Interactive first-time setup — GDrive API for cloud storage */
+/** Interactive first-time setup — GDrive API for cloud storage.
+ *  Returns true if an account was added (caller should proceed to launch UI),
+ *  false if the user skipped (UI's in-browser setup form will take over). */
 async function runSetup(providedEmail) {
     console.log("\nmailx — first-time setup\n");
     const home = process.env.USERPROFILE || process.env.HOME || "";
     const mailxDir = path.join(home, ".mailx");
+    fs.mkdirSync(mailxDir, { recursive: true });
     // Use --email flag or prompt interactively
     const email = providedEmail || await prompt("Email address (Gmail recommended): ");
     if (!email || !email.includes("@")) {
         console.log(`\nNo account added. The UI will show a setup form.`);
-        fs.mkdirSync(mailxDir, { recursive: true });
         return false;
     }
     if (providedEmail)
@@ -493,15 +495,15 @@ async function runSetup(providedEmail) {
         catch { /* DNS lookup failed */ }
     }
     // For Google-hosted accounts, check Drive for existing settings first
+    let driveFolderId = null;
     if (isGoogle) {
-        fs.mkdirSync(mailxDir, { recursive: true });
         console.log("\nChecking Google Drive for existing mailx settings...");
         try {
             const { gDriveFindOrCreateFolder, getCloudProvider } = await import("@bobfrankston/mailx-settings/cloud.js");
-            const folderId = await gDriveFindOrCreateFolder();
-            if (folderId) {
-                console.log(`  Drive folder: My Drive/mailx/ (${folderId})`);
-                const gdrive = getCloudProvider("gdrive", folderId);
+            driveFolderId = await gDriveFindOrCreateFolder();
+            if (driveFolderId) {
+                console.log(`  Drive folder: My Drive/mailx/ (${driveFolderId})`);
+                const gdrive = getCloudProvider("gdrive", driveFolderId);
                 if (gdrive) {
                     // Read accounts.jsonc (canonical) — ignore legacy settings.jsonc
                     const existing = await gdrive.read("accounts.jsonc");
@@ -514,7 +516,7 @@ async function runSetup(providedEmail) {
                             for (const a of accts)
                                 console.log(`  • ${a.label || a.name || a.email}`);
                             // Save config pointing to Drive — no prompts needed
-                            const config = { sharedDir: { provider: "gdrive", path: "mailx", folderId } };
+                            const config = { sharedDir: { provider: "gdrive", path: "mailx", folderId: driveFolderId } };
                             fs.writeFileSync(path.join(mailxDir, "config.jsonc"), JSON.stringify(config, null, 2));
                             console.log("Local config created. Starting mailx...\n");
                             return true;
@@ -522,12 +524,16 @@ async function runSetup(providedEmail) {
                     }
                 }
                 // No existing accounts — save Drive config for later
-                const config = { sharedDir: { provider: "gdrive", path: "mailx", folderId } };
+                const config = { sharedDir: { provider: "gdrive", path: "mailx", folderId: driveFolderId } };
                 fs.writeFileSync(path.join(mailxDir, "config.jsonc"), JSON.stringify(config, null, 2));
             }
+            else {
+                console.log("  Could not access Google Drive (OAuth not granted or token expired).");
+                console.log("  Account will be saved locally; the UI will retry the cloud sync when you fix Drive access.");
+            }
         }
         catch (e) {
-            console.log(`  Drive check failed: ${e.message} — continuing with manual setup`);
+            console.log(`  Drive check failed: ${e.message} — will save locally and retry from UI.`);
         }
     }
     // No existing accounts found — build a new account
@@ -536,42 +542,35 @@ async function runSetup(providedEmail) {
     if (!isOAuth) {
         account.password = await prompt("Password (app password for Yahoo/AOL/iCloud): ");
     }
-    const name = await prompt(`Your name (for From: header) [${email.split("@")[0]}]: `) || email.split("@")[0];
-    fs.mkdirSync(mailxDir, { recursive: true });
-    if (isGoogle) {
+    // Display name: leave empty for Google accounts so MailxService.setupAccount
+    // (or the next launch's IMAP auth) can resolve it from the People API once
+    // the Gmail OAuth token exists. The Drive token alone doesn't have the
+    // contacts.readonly scope, so we can't fetch it here at CLI-prompt time.
+    const defaultName = email.split("@")[0];
+    const name = await prompt(`Your name (for From: header) [auto-detect from Google, or '${defaultName}']: `) || (isGoogle ? "" : defaultName);
+    // ALWAYS write a local copy first so the data is never lost. The cloud
+    // write below is the sync, not the source of truth on this machine.
+    const accountsData = { name, accounts: [account] };
+    const localAccountsPath = path.join(mailxDir, "accounts.jsonc");
+    fs.writeFileSync(localAccountsPath, JSON.stringify(accountsData, null, 2));
+    if (isGoogle && driveFolderId) {
         // Save to Google Drive via API
         console.log("\nSaving account to Google Drive...");
         try {
-            const { gDriveFindOrCreateFolder, getCloudProvider } = await import("@bobfrankston/mailx-settings/cloud.js");
-            const folderId = await gDriveFindOrCreateFolder();
-            if (folderId) {
-                const gdrive = getCloudProvider("gdrive", folderId);
-                if (gdrive) {
-                    const accountsData = { name, accounts: [account] };
-                    const ok = await gdrive.write("accounts.jsonc", JSON.stringify(accountsData, null, 2));
-                    if (ok) {
-                        console.log("Account saved to Google Drive.");
-                        // config.jsonc may already exist from the Drive check above
-                        if (!fs.existsSync(path.join(mailxDir, "config.jsonc"))) {
-                            const config = { sharedDir: { provider: "gdrive", path: "mailx", folderId } };
-                            fs.writeFileSync(path.join(mailxDir, "config.jsonc"), JSON.stringify(config, null, 2));
-                        }
-                    }
-                    else {
-                        console.log("Drive write failed — saving locally.");
-                        fs.writeFileSync(path.join(mailxDir, "accounts.jsonc"), JSON.stringify({ name, accounts: [account] }, null, 2));
-                    }
-                }
-            }
+            const { getCloudProvider } = await import("@bobfrankston/mailx-settings/cloud.js");
+            const gdrive = getCloudProvider("gdrive", driveFolderId);
+            if (!gdrive)
+                throw new Error("getCloudProvider returned null");
+            await gdrive.write("accounts.jsonc", JSON.stringify(accountsData, null, 2));
+            console.log("  Account saved to Google Drive.");
         }
         catch (e) {
-            console.log(`Drive error: ${e.message} — saving locally.`);
-            fs.writeFileSync(path.join(mailxDir, "accounts.jsonc"), JSON.stringify({ name, accounts: [account] }, null, 2));
+            console.log(`  Drive write failed: ${e.message}`);
+            console.log(`  Local copy saved at ${localAccountsPath} — UI will retry cloud sync.`);
         }
     }
-    else {
-        // Non-Google — save locally
-        fs.writeFileSync(path.join(mailxDir, "accounts.jsonc"), JSON.stringify({ name, accounts: [account] }, null, 2));
+    else if (isGoogle && !driveFolderId) {
+        console.log(`  Skipping Drive sync (no folder ID). Local copy at ${localAccountsPath}.`);
     }
     console.log("Setup complete. Starting mailx...\n");
     return true;
@@ -709,10 +708,15 @@ async function registerClient(settings) {
         ip: localIp,
         version: JSON.parse(fs.readFileSync(path.join(import.meta.dirname, "..", "package.json"), "utf-8")).version,
     };
-    // Write back
-    const ok = await cloudWrite("clients.jsonc", JSON.stringify(clients, null, 2));
-    if (ok)
+    // Write back. cloudWrite now throws on failure (and sets lastCloudError),
+    // so swallow here — registerClient is fire-and-forget from the caller.
+    try {
+        await cloudWrite("clients.jsonc", JSON.stringify(clients, null, 2));
         console.log(`  [client] Registered device: ${deviceId}`);
+    }
+    catch (e) {
+        console.error(`  [client] Failed to register device: ${e.message}`);
+    }
 }
 async function main() {
     log(`Platform: ${process.platform} ${process.arch}`);
@@ -746,7 +750,12 @@ async function main() {
         }
         process.exit(0);
     }
-    // Auto-detect first run — enter setup if no config exists
+    // Auto-detect first run — enter setup if no config exists.
+    // Skip CLI prompts entirely when stdin isn't a TTY (auto-detached daemon
+    // has stdio:"ignore", so prompt() returns "" instantly and the user never
+    // gets to type their email — silent no-setup). The in-browser setup form
+    // takes over in that case.
+    const hasTty = setupMode ? !!process.stdin.isTTY : (process.stdin.isTTY === true);
     if (setupMode || !hasConfig()) {
         if (!setupMode)
             console.log("No mailx configuration found.");
@@ -754,7 +763,15 @@ async function main() {
         const emailFlag = args.findIndex(a => a === "-email" || a === "--email" || a === "-mail" || a === "--mail");
         const emailArg = args.find(a => a.startsWith("-email=") || a.startsWith("--email=") || a.startsWith("-mail=") || a.startsWith("--mail="))?.split("=")[1]
             || (emailFlag >= 0 ? args[emailFlag + 1] : undefined);
-        await runSetup(emailArg);
+        if (hasTty || emailArg) {
+            await runSetup(emailArg);
+        }
+        else {
+            console.log("No TTY and no -email flag — skipping CLI setup; in-browser setup form will appear.");
+            // Ensure the data dir exists so the UI can write its config.
+            const home = process.env.USERPROFILE || process.env.HOME || "";
+            fs.mkdirSync(path.join(home, ".mailx"), { recursive: true });
+        }
     }
     // Redirect console to log file — keep terminal clean
     if (!verbose) {
@@ -906,6 +923,39 @@ async function main() {
     imapManager.on("configChanged", (filename) => {
         handle.send({ _event: "configChanged", type: "configChanged", filename });
     });
+    // syncComplete drives the folder-tree refresh that picks up newly-discovered
+    // folders on first run (Gmail accounts have no folders in the DB until the
+    // first sync fetches the labels). Without this forward, the UI shows the
+    // account but no folders, and never auto-selects the inbox.
+    imapManager.on("syncComplete", (accountId) => {
+        handle.send({ _event: "syncComplete", type: "syncComplete", accountId });
+    });
+    // Cloud-write/read failures from mailx-settings → push to UI as a banner so
+    // silent fall-back-to-local can no longer swallow Drive errors.
+    const { onCloudError } = await import("@bobfrankston/mailx-settings");
+    onCloudError((error, ctx) => {
+        if (error) {
+            handle.send({ _event: "cloudError", type: "cloudError", error, op: ctx?.op, filename: ctx?.filename });
+        }
+        else {
+            handle.send({ _event: "cloudError", type: "cloudError", error: null });
+        }
+    });
+    // Coalesce bodyCached into batches so a prefetch storm doesn't flood stdin
+    // with one IPC write per message — lets the UI flip many rows at once.
+    let pendingCached = [];
+    let cachedTimer = null;
+    imapManager.on("bodyCached", (accountId, uid) => {
+        pendingCached.push({ accountId, uid });
+        if (!cachedTimer) {
+            cachedTimer = setTimeout(() => {
+                cachedTimer = null;
+                const batch = pendingCached;
+                pendingCached = [];
+                handle.send({ _event: "bodyCached", type: "bodyCached", items: batch });
+            }, 500);
+        }
+    });
     // Brief pause for WebView2 to initialize before starting IMAP (avoids stdin writes during init)
     await new Promise(r => setTimeout(r, 500));
     // Register all accounts (OAuth may open browser for Gmail — event loop stays free for IPC)
@@ -920,11 +970,61 @@ async function main() {
             console.error(`  Failed: ${account.id}: ${e.message}`);
         }
     }
+    // After OAuth has completed, resolve missing display names for Google
+    // accounts via the People API (contacts.readonly is in the Gmail scope).
+    // "Missing" = empty or matches the email local-part default.
+    try {
+        const { getGoogleProfile } = await import("@bobfrankston/mailx-settings/cloud.js");
+        const { saveAccounts } = await import("@bobfrankston/mailx-settings");
+        let updated = false;
+        for (const acct of settings.accounts) {
+            if (!acct.enabled)
+                continue;
+            const isGoogle = acct.email.endsWith("@gmail.com")
+                || acct.email.endsWith("@googlemail.com")
+                || acct.imap?.host?.includes("gmail");
+            if (!isGoogle)
+                continue;
+            const local = acct.email.split("@")[0];
+            const looksDefault = !acct.name || acct.name === local;
+            if (!looksDefault)
+                continue;
+            try {
+                const tok = await imapManager.getOAuthToken(acct.id);
+                if (!tok)
+                    continue;
+                const profile = await getGoogleProfile(tok);
+                if (profile?.name && profile.name !== acct.name) {
+                    console.log(`  [name-resolve] ${acct.id}: '${acct.name || "(empty)"}' → '${profile.name}'`);
+                    acct.name = profile.name;
+                    updated = true;
+                }
+            }
+            catch (e) {
+                console.error(`  [name-resolve] ${acct.id}: ${e.message}`);
+            }
+        }
+        if (updated) {
+            try {
+                await saveAccounts(settings.accounts);
+            }
+            catch (e) {
+                console.error(`  [name-resolve] saveAccounts failed: ${e.message}`);
+            }
+        }
+    }
+    catch (e) {
+        console.error(`  [name-resolve] init failed: ${e.message}`);
+    }
     // Register this client device on GDrive (fire-and-forget)
     registerClient(settings).catch(() => { });
-    // Start sync in background — don't block
+    // Start sync in background — don't block. Kick off IDLE watchers once the
+    // initial sync finishes so IMAP accounts get instant-push new-mail (the
+    // 5-min STATUS poll is only a safety net).
     if (settings.accounts.some(a => a.enabled)) {
-        imapManager.syncAll().catch(e => console.error(`  Sync error: ${e.message}`));
+        imapManager.syncAll()
+            .then(() => imapManager.startWatching())
+            .catch(e => console.error(`  Sync error: ${e.message}`));
     }
     imapManager.startPeriodicSync(settings.sync.intervalMinutes);
     imapManager.startOutboxWorker();

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":707,"y":89}
+{"height":1344,"width":2151,"x":284,"y":38}

package/client/app.js

@@ -3,7 +3,7 @@
  * Wires together all UI components and WebSocket connection.
  */
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced } from "./components/folder-tree.js";
-import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, getSelectedMessages } from "./components/message-list.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 * as messageState from "./lib/message-state.js";
@@ -831,18 +831,54 @@ window.addEventListener("message", (e) => {
         }
     }
     if (e.data?.type === "linkHover") {
-        const statusEl = document.getElementById("status-sync");
-        if (statusEl) {
-            if (e.data.url) {
-                statusEl.textContent = e.data.url;
-                statusEl.style.color = "var(--color-text-muted)";
+        let pop = document.getElementById("link-hover-popover");
+        if (!e.data.url) {
+            if (pop)
+                pop.style.display = "none";
+        }
+        else {
+            if (!pop) {
+                pop = document.createElement("div");
+                pop.id = "link-hover-popover";
+                pop.style.cssText = "position:fixed;z-index:10000;max-width:520px;padding:6px 10px;background:var(--color-surface,#fff);color:var(--color-text,#000);border:1px solid var(--color-border,#888);border-radius:6px;box-shadow:0 4px 12px rgba(0,0,0,0.18);font-size:12px;line-height:1.4;word-break:break-all;pointer-events:none;";
+                document.body.appendChild(pop);
             }
-            else {
-                statusEl.textContent = "";
-                statusEl.style.color = "";
+            pop.textContent = e.data.url;
+            pop.style.display = "block";
+            // Locate the iframe whose contentWindow matches e.source so we can
+            // translate iframe-local rect coords into viewport coords.
+            let iframeRect = null;
+            for (const f of Array.from(document.querySelectorAll("iframe"))) {
+                if (f.contentWindow === e.source) {
+                    iframeRect = f.getBoundingClientRect();
+                    break;
+                }
+            }
+            const r = e.data.rect;
+            if (iframeRect && r) {
+                const x = Math.max(4, Math.min(window.innerWidth - 528, iframeRect.left + r.left));
+                let y = iframeRect.top + r.bottom + 4;
+                // If it would clip bottom, flip above the link
+                if (y + 60 > window.innerHeight)
+                    y = Math.max(4, iframeRect.top + r.top - 60);
+                pop.style.left = x + "px";
+                pop.style.top = y + "px";
             }
         }
     }
+    if (e.data?.type === "previewKey" && typeof e.data.key === "string") {
+        // Re-dispatch as a real keydown on document so the hotkey handler
+        // below runs the same code path as a list-focused keypress. Used
+        // when focus is inside the sandboxed preview iframe — works on
+        // platforms where parent-side contentDocument listeners don't.
+        const ev = new KeyboardEvent("keydown", {
+            key: e.data.key, code: e.data.code || "",
+            ctrlKey: !!e.data.ctrlKey, shiftKey: !!e.data.shiftKey,
+            altKey: !!e.data.altKey, metaKey: !!e.data.metaKey,
+            bubbles: true, cancelable: true,
+        });
+        document.dispatchEvent(ev);
+    }
 });
 // ── Splitter drag ──
 const splitter = document.getElementById("splitter-h");
@@ -954,6 +990,11 @@ onWsEvent((event) => {
         case "reload":
             location.reload();
             break;
+        case "bodyCached":
+            // Prefetch (or on-demand fetch) downloaded a body — flip the
+            // "not-downloaded" indicator to the teal dot for any rows in view.
+            markBodiesCached(event.items || []);
+            break;
         case "configChanged":
             // A watched config file was modified — could be user edit via the
             // JSONC editor, a GDrive sync, or mailx itself saving (e.g.
@@ -967,6 +1008,22 @@ onWsEvent((event) => {
                 }, 8000);
             }
             break;
+        case "cloudError":
+            // Cloud read/write failed (Google Drive auth/network/etc.). Show a
+            // sticky banner so the user knows the change wasn't synced. When
+            // error is null, the next successful op cleared it — hide it.
+            if (event.error) {
+                const where = event.filename ? ` (${event.op || "sync"} ${event.filename})` : "";
+                showAlert(`Cloud sync error${where}: ${event.error}`, "cloud-error");
+            }
+            else {
+                // Only hide if the visible banner is the cloud-error one
+                if (alertBanner && alertBanner.dataset.key === "cloud-error") {
+                    alertBanner.hidden = true;
+                    dismissedAlerts.delete("cloud-error");
+                }
+            }
+            break;
         case "error":
             if (statusSync)
                 statusSync.textContent = `Error: ${event.message}`;
@@ -1340,16 +1397,17 @@ optThreaded?.addEventListener("change", () => {
     localStorage.setItem("mailx-threaded", String(optThreaded.checked));
     reloadCurrentFolder();
 });
-// Flagged-only filter
+// Flagged-only filter — keeps the CSS-level hiding for instant feedback on
+// the current page AND re-queries the folder so flagged messages that live
+// outside the currently-loaded page show up.
 optFlagged?.addEventListener("change", () => {
     const body = document.getElementById("ml-body");
-    if (optFlagged.checked) {
+    if (optFlagged.checked)
         body?.classList.add("flagged-only");
-    }
-    else {
+    else
         body?.classList.remove("flagged-only");
-    }
     localStorage.setItem("mailx-flagged", String(optFlagged.checked));
+    reloadCurrentFolder();
 });
 // Folder counts toggle
 optFolderCounts?.addEventListener("change", () => {

package/client/components/folder-tree.js

@@ -450,8 +450,8 @@ async function loadFolderTree(container) {
                     <p id="setup-form-intro">${introText}</p>
                     <form id="setup-form" style="margin-top:1rem;${formDisplay}">
                         <label style="display:block;margin-bottom:0.5rem">
-                            Your name
-                            <input id="setup-name" type="text" placeholder="Your Name" style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
+                            Your name <span id="setup-name-hint" style="color:var(--color-text-muted);font-size:0.85rem">(optional — auto-detected from Google)</span>
+                            <input id="setup-name" type="text" placeholder="Your Name (leave blank to use Google profile)" style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
                         </label>
                         <label style="display:block;margin-bottom:0.5rem">
                             Email address

package/client/components/message-list.js

@@ -16,6 +16,21 @@ let unifiedMode = false;
 let searchMode = false;
 let currentSearchQuery = "";
 let showToInsteadOfFrom = false;
+let touchWasScroll = false;
+/** Flip the "not-downloaded" indicator off for rows whose bodies just cached.
+ *  Called from the bodyCached service event — covers both background prefetch
+ *  and on-demand fetch. No-op for rows not currently rendered. */
+export function markBodiesCached(items) {
+    const body = document.getElementById("ml-body");
+    if (!body || items.length === 0)
+        return;
+    for (const { accountId, uid } of items) {
+        const row = body.querySelector(`.ml-row[data-uid="${uid}"][data-account-id="${CSS.escape(accountId)}"]`)
+            || body.querySelector(`.ml-row[data-uid="${uid}"]`);
+        if (row)
+            row.classList.remove("not-downloaded");
+    }
+}
 /** Get all selected message rows */
 export function getSelectedMessages() {
     const body = document.getElementById("ml-body");
@@ -55,6 +70,25 @@ export function initMessageList(handler) {
     // Infinite scroll
     const body = document.getElementById("ml-body");
     if (body) {
+        // Touch scroll vs tap: track finger movement at the container level and
+        // flag "we were scrolling" so row click handlers can bail out. WebView
+        // sometimes fires click on touchend even when the user dragged — which
+        // was opening a message just from scrolling the list.
+        let touchStartY = 0;
+        let touchStartX = 0;
+        const TAP_SLOP = 10;
+        body.addEventListener("touchstart", (e) => {
+            const t = e.touches[0];
+            touchStartY = t.clientY;
+            touchStartX = t.clientX;
+            touchWasScroll = false;
+        }, { passive: true });
+        body.addEventListener("touchmove", (e) => {
+            const t = e.touches[0];
+            if (Math.abs(t.clientY - touchStartY) > TAP_SLOP || Math.abs(t.clientX - touchStartX) > TAP_SLOP) {
+                touchWasScroll = true;
+            }
+        }, { passive: true });
         body.addEventListener("scroll", () => {
             if (loading)
                 return;
@@ -236,11 +270,12 @@ export async function loadMessages(accountId, folderId, page = 1, specialUse = "
         body.innerHTML = `<div class="ml-empty">Loading...</div>`;
     }
     try {
-        const result = await apiGetMessages(accountId, folderId, 1);
+        const flaggedOnly = document.getElementById("ml-body")?.classList.contains("flagged-only") || false;
+        const result = await apiGetMessages(accountId, folderId, 1, 50, flaggedOnly);
         totalMessages = result.total;
         if (result.items.length === 0) {
             state.setMessages([]);
-            body.innerHTML = `<div class="ml-empty">No messages</div>`;
+            body.innerHTML = `<div class="ml-empty">${flaggedOnly ? "No flagged messages" : "No messages"}</div>`;
             return;
         }
         state.setMessages(result.items);
@@ -268,11 +303,12 @@ async function loadMoreMessages() {
     loading = true;
     currentPage++;
     try {
+        const flaggedOnly = body.classList.contains("flagged-only");
         const result = searchMode
             ? await searchMessages(currentSearchQuery, currentPage)
             : unifiedMode
                 ? await apiGetUnifiedInbox(currentPage)
-                : await apiGetMessages(currentAccountId, currentFolderId, currentPage);
+                : await apiGetMessages(currentAccountId, currentFolderId, currentPage, 50, flaggedOnly);
         // Append to state
         const current = state.getMessages();
         state.setMessages([...current, ...result.items]);
@@ -479,6 +515,10 @@ function appendMessages(body, accountId, items) {
         row.appendChild(date);
         row.appendChild(subject);
         row.addEventListener("click", (e) => {
+            if (touchWasScroll) {
+                touchWasScroll = false;
+                return;
+            }
             if (e.shiftKey && lastClickedRow) {
                 clearSelection();
                 selectRange(lastClickedRow, row);

package/client/components/message-viewer.js

@@ -550,20 +550,22 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
         // "Message was deleted from the server" — the service already dropped
         // the local row. Remove it from the list so the UI advances to the next
         // message instead of sitting on a stale error banner.
-        const isDeleted = /deleted from the server|isNotFound/.test(err);
-        if (isDeleted) {
+        const isNotFound = /deleted from the server|isNotFound|not found|Not Found|404/.test(err);
+        if (isNotFound) {
+            // Drop the stale row so the list auto-advances to the next message
+            // (or clears the viewer). Leaves the user a way back on mobile where
+            // the viewer takes the whole screen.
             state.removeMessages([{ accountId, uid }]);
             return;
         }
-        const isNotFound = err.includes("not found") || err.includes("Not Found") || err.includes("404");
-        if (!isNotFound && retryCount < 3) {
+        if (retryCount < 3) {
             retryCount++;
             bodyEl.innerHTML = `<div class="mv-empty">Loading failed: ${err} — retrying (${retryCount}/3)...</div>`;
             setTimeout(() => { if (gen === showMessageGeneration)
                 showMessage(accountId, uid, folderId, specialUse, true); }, 3000);
         }
         else {
-            bodyEl.innerHTML = `<div class="mv-empty">${isNotFound ? "Message was moved or deleted" : `Failed to load: ${err}`}</div>`;
+            bodyEl.innerHTML = `<div class="mv-empty">Failed to load: ${err}</div>`;
         }
     }
 }
@@ -658,7 +660,28 @@ ${csp}
     }, true);
     document.addEventListener("mouseover", function (e) {
         var a = e.target && e.target.closest ? e.target.closest("a[href]") : null;
-        window.parent.postMessage({ type: "linkHover", url: a ? a.href : "" }, "*");
+        if (a) {
+            var r = a.getBoundingClientRect();
+            window.parent.postMessage({ type: "linkHover", url: a.href, rect: { left: r.left, top: r.top, right: r.right, bottom: r.bottom } }, "*");
+        } else {
+            window.parent.postMessage({ type: "linkHover", url: "" }, "*");
+        }
+    });
+    // Key forwarding — Delete, Ctrl+D, arrow keys, etc. need to reach app.ts
+    // even when focus is inside the sandboxed iframe. Parent-side
+    // contentDocument listeners (see installPreviewControls) work on
+    // desktop WebView2 but not Android WebView, so we post every keydown
+    // that isn't plain typing.
+    document.addEventListener("keydown", function (e) {
+        var t = e.target;
+        if (t && (t.isContentEditable || /^(INPUT|TEXTAREA|SELECT)$/.test(t.tagName))) return;
+        // Zoom keys handled by parent-side installPreviewControls; don't double-send.
+        if (e.ctrlKey && (e.key === "=" || e.key === "+" || e.key === "-" || e.key === "0")) return;
+        window.parent.postMessage({
+            type: "previewKey",
+            key: e.key, code: e.code,
+            ctrlKey: e.ctrlKey, shiftKey: e.shiftKey, altKey: e.altKey, metaKey: e.metaKey,
+        }, "*");
     });
 })();
 </script>

package/client/lib/api-client.js

@@ -33,9 +33,9 @@ export function getAccounts() {
 export function getFolders(accountId) {
     return ipc().getFolders(accountId);
 }
-export function getMessages(accountId, folderId, page = 1, pageSize = 50) {
+export function getMessages(accountId, folderId, page = 1, pageSize = 50, flaggedOnly = false) {
     abortMessageListRequests();
-    return ipc().getMessages(accountId, folderId, page, pageSize);
+    return ipc().getMessages(accountId, folderId, page, pageSize, undefined, undefined, undefined, flaggedOnly);
 }
 export function getUnifiedInbox(page = 1, pageSize = 50) {
     abortMessageListRequests();

package/client/lib/mailxapi.js

@@ -65,8 +65,8 @@
         getFolders: function(accountId) { return callNode("getFolders", { accountId: accountId }); },
 
         // Messages
-        getMessages: function(accountId, folderId, page, pageSize) {
-            return callNode("getMessages", { accountId: accountId, folderId: folderId, page: page, pageSize: pageSize });
+        getMessages: function(accountId, folderId, page, pageSize, sort, sortDir, search, flaggedOnly) {
+            return callNode("getMessages", { accountId: accountId, folderId: folderId, page: page, pageSize: pageSize, sort: sort, sortDir: sortDir, search: search, flaggedOnly: flaggedOnly });
         },
         getUnifiedInbox: function(page, pageSize) {
             return callNode("getUnifiedInbox", { page: page, pageSize: pageSize });