@bobfrankston/mailx 1.0.447 → 1.0.449

package/client/app.js

@@ -799,19 +799,24 @@ function showComposeOverlay(title = "Compose") {
     wrapper.appendChild(frame);
     document.body.appendChild(wrapper);
 }
-function quoteBody(msg) {
-    const date = new Date(msg.date).toLocaleString();
-    const from = msg.from.name ? `${msg.from.name} <${msg.from.address}>` : msg.from.address;
-    // Simplify complex HTML (tables, inline styles) for Quill compatibility
+// Marketing-email layout tables (deeply nested, fixed widths) collapse to
+// 30-40px columns inside a phone-width compose pane and wrap text
+// character-by-character. Strip styles + flatten tables before quoting.
+function sanitizeQuotedBody(msg) {
     let body = msg.bodyHtml || `<pre>${msg.bodyText || ""}</pre>`;
-    // Strip style tags and attributes
     body = body.replace(/<style[^>]*>[\s\S]*?<\/style>/gi, "");
     body = body.replace(/\s+style="[^"]*"/gi, "");
     body = body.replace(/\s+class="[^"]*"/gi, "");
-    // Convert tables to simple divs
+    body = body.replace(/\s+(width|height|align|valign|bgcolor|cellpadding|cellspacing|border)="[^"]*"/gi, "");
     body = body.replace(/<table[^>]*>/gi, "<div>").replace(/<\/table>/gi, "</div>");
     body = body.replace(/<t[rdh][^>]*>/gi, "").replace(/<\/t[rdh]>/gi, " ");
     body = body.replace(/<thead[^>]*>|<\/thead>|<tbody[^>]*>|<\/tbody>/gi, "");
+    return body;
+}
+function quoteBody(msg) {
+    const date = new Date(msg.date).toLocaleString();
+    const from = msg.from.name ? `${msg.from.name} &lt;${msg.from.address}&gt;` : msg.from.address;
+    const body = sanitizeQuotedBody(msg);
     // Two blank lines above the quote so the cursor lands with breathing room
     // between the user's reply and the "On ... wrote:" line.
     return `<br><br><div class="reply"><p>On ${date}, ${from} wrote:</p><blockquote>${body}</blockquote></div>`;
@@ -820,7 +825,7 @@ function forwardBody(msg) {
     const date = new Date(msg.date).toLocaleString();
     const from = msg.from.name ? `${msg.from.name} &lt;${msg.from.address}&gt;` : msg.from.address;
     const to = msg.to.map((a) => a.name ? `${a.name} &lt;${a.address}&gt;` : a.address).join(", ");
-    const body = msg.bodyHtml || `<pre>${msg.bodyText || ""}</pre>`;
+    const body = sanitizeQuotedBody(msg);
     return `<br><br><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
 }
 let lastDeleted = null;
@@ -2905,6 +2910,34 @@ optCheckReputation?.addEventListener("change", () => {
         saveSettings(settings);
     }).catch(() => { });
 });
+// Auto mark-as-read settings (per-device localStorage; the viewer reads
+// these directly when showing a message). Default on with a 2s delay so
+// scrolling through a folder doesn't mark every glanced-at message as
+// read, but a deliberate read still gets recorded.
+const optAutomarkRead = document.getElementById("opt-automark-read");
+const optAutomarkDelay = document.getElementById("opt-automark-delay");
+try {
+    if (optAutomarkRead)
+        optAutomarkRead.checked = localStorage.getItem("mailx-automark-read") !== "false";
+    if (optAutomarkDelay)
+        optAutomarkDelay.value = localStorage.getItem("mailx-automark-delay") || "2";
+}
+catch { /* private mode */ }
+optAutomarkRead?.addEventListener("change", () => {
+    try {
+        localStorage.setItem("mailx-automark-read", String(optAutomarkRead.checked));
+    }
+    catch { /* */ }
+});
+optAutomarkDelay?.addEventListener("change", () => {
+    const v = parseFloat(optAutomarkDelay.value);
+    if (Number.isFinite(v) && v >= 0) {
+        try {
+            localStorage.setItem("mailx-automark-delay", String(v));
+        }
+        catch { /* */ }
+    }
+});
 const isApp = typeof mailxapi !== "undefined" && mailxapi?.isApp;
 // Wait for server ready signal, then fetch version
 const versionPromise = getVersion();

package/client/components/message-viewer.js

@@ -297,10 +297,44 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
             return;
         currentMessage = msg;
         currentAccountId = accountId;
-        // Mark as read
+        // Mark as read — gated by user prefs:
+        //   - mailx-automark-read (default "true"): if "false", never auto-mark
+        //   - mailx-automark-delay (default "2"): seconds to wait before
+        //     marking. Lets the user click through messages quickly without
+        //     marking ones they didn't actually read. The timer is tied to
+        //     showMessageGeneration; navigating to another message advances
+        //     the generation and cancels the pending mark.
         if (!msg.flags.includes("\\Seen")) {
-            const newFlags = [...msg.flags, "\\Seen"];
-            updateFlags(accountId, uid, newFlags);
+            let enabled = true;
+            let delaySec = 2;
+            try {
+                enabled = localStorage.getItem("mailx-automark-read") !== "false";
+                const d = parseFloat(localStorage.getItem("mailx-automark-delay") || "2");
+                if (Number.isFinite(d) && d >= 0)
+                    delaySec = d;
+            }
+            catch { /* private mode — defaults */ }
+            if (enabled) {
+                const captureGen = gen;
+                const newFlags = [...msg.flags, "\\Seen"];
+                if (delaySec === 0) {
+                    updateFlags(accountId, uid, newFlags);
+                }
+                else {
+                    setTimeout(() => {
+                        // Stale: user moved on before the timer fired.
+                        if (captureGen !== showMessageGeneration)
+                            return;
+                        updateFlags(accountId, uid, newFlags);
+                        // Reflect locally so the list row stops looking unread.
+                        msg.flags = newFlags;
+                        try {
+                            state.updateMessageFlags(accountId, uid, newFlags);
+                        }
+                        catch { /* */ }
+                    }, delaySec * 1000);
+                }
+            }
         }
         // Header
         headerEl.hidden = false;

package/client/index.html

@@ -57,6 +57,9 @@
                     <label class="tb-menu-item" title="Right-click in compose editor → Proofread (when wired)"><input type="checkbox" id="opt-ai-proofread"> AI proofread (off by default)</label>
                     <label class="tb-menu-item" title="When opening a message with remote content, look up the sender's domain in three free DNS blocklists in parallel: Spamhaus DBL, SURBL, URIBL. The banner shows N-of-3 services flagging the domain. Each query leaks the bare domain to that DNSBL's DNS. Off by default."><input type="checkbox" id="opt-check-reputation"> Check sender reputation (DNSBLs)</label>
                     <hr class="tb-menu-sep">
+                    <label class="tb-menu-item" title="When viewing a message, automatically mark it as read after a short delay. Uncheck to require an explicit Mark-Read action."><input type="checkbox" id="opt-automark-read" checked> Auto mark-as-read</label>
+                    <label class="tb-menu-item" title="Seconds to wait before auto-marking a viewed message as read. Higher = scroll past messages without changing their unread state. 0 = mark immediately.">Mark-read delay (sec) <input type="number" id="opt-automark-delay" min="0" max="30" step="0.5" style="width:4em"></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-open-mailx-dir" title="Open ~/.mailx in file explorer">Open mailx folder...</button>
                     <button class="tb-menu-item" id="btn-open-log" title="Open today's log file">Open log...</button>

package/client/lib/message-state.js

@@ -27,13 +27,18 @@ function notify(change) {
         catch { /* don't let one subscriber break others */ }
     }
 }
-/** Replace the entire message list (folder load, search, unified inbox) */
+/** Replace the entire message list (folder load, search, unified inbox).
+ *  Selection stays even when the previously-selected message isn't in
+ *  the new list — that case happens whenever a periodic sync re-fetches
+ *  page 1 of the unified inbox and a row the user opened earlier has
+ *  scrolled off, or when the same row's accountId/uid pair changes
+ *  shape after dedup. Yanking the viewer mid-read was a user-reported
+ *  surprise (2026-04-30: "I was reading a message but now it just
+ *  jumped to Select a message to read"). The viewer keeps the message
+ *  it has; it'll only clear when the user explicitly clicks elsewhere
+ *  or the message is removed via removeMessages (real delete/move). */
 export function setMessages(msgs) {
     messages = msgs;
-    // If the previously selected message is no longer in the list, deselect
-    if (selected && !messages.find(m => m.uid === selected.uid && m.accountId === selected.accountId)) {
-        selected = null;
-    }
     notify("messages");
 }
 /** Get current messages */
@@ -52,6 +57,10 @@ export function getSelected() {
 /**
  * Remove messages from the list (after move or delete).
  * If the selected message is removed, auto-selects the next message or null.
+ * Decrements dupeCount on any remaining messages that shared a Message-ID
+ * with one of the removed rows — so the unified-inbox ⇆ marker disappears
+ * when one half of a duplicate pair is deleted, instead of pointing at a
+ * sibling that no longer exists.
  */
 export function removeMessages(uids) {
     const removeSet = new Set(uids.map(u => `${u.accountId}:${u.uid}`));
@@ -60,7 +69,28 @@ export function removeMessages(uids) {
         selectedIdx = messages.findIndex(m => m.uid === selected.uid && m.accountId === selected.accountId);
     }
     const wasSelectedRemoved = selected && removeSet.has(`${selected.accountId}:${selected.uid}`);
+    // Capture Message-IDs of the rows about to leave, so we can fix up the
+    // dupeCount on any remaining siblings. Only IDs that were in the list
+    // and had a non-empty messageId count — empty IDs would match every
+    // headerless row and falsely "merge" them.
+    const removedIds = new Set();
+    for (const m of messages) {
+        if (removeSet.has(`${m.accountId}:${m.uid}`) && m.messageId) {
+            removedIds.add(m.messageId);
+        }
+    }
     messages = messages.filter(m => !removeSet.has(`${m.accountId}:${m.uid}`));
+    // Sibling dupeCount adjustment. dupeCount is server-recomputed on the
+    // next getUnifiedInbox fetch, but we don't want to wait for that —
+    // user just deleted, the marker should drop now. Decrement once per
+    // remaining message whose messageId matches a removed one.
+    if (removedIds.size > 0) {
+        for (const m of messages) {
+            if (m.messageId && removedIds.has(m.messageId) && typeof m.dupeCount === "number") {
+                m.dupeCount = Math.max(0, m.dupeCount - 1);
+            }
+        }
+    }
     if (wasSelectedRemoved) {
         // Auto-select next message (same index, or last, or null)
         if (messages.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.447",
+  "version": "1.0.449",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",