@bobfrankston/rmfmail 1.2.87 → 1.2.96

package/client/app.bundle.js

@@ -193,13 +193,13 @@ function getAccounts() {
 function getFolders(accountId) {
   return ipc().getFolders(accountId);
 }
-function getMessages(accountId, folderId, page = 1, pageSize = 50, flaggedOnly = false, sort, sortDir) {
+function getMessages(accountId, folderId, page = 1, pageSize = 50, flaggedOnly = false, sort, sortDir, dateBasis2) {
   abortMessageListRequests();
-  return ipc().getMessages(accountId, folderId, page, pageSize, sort, sortDir, void 0, flaggedOnly);
+  return ipc().getMessages(accountId, folderId, page, pageSize, sort, sortDir, void 0, flaggedOnly, dateBasis2);
 }
-function getUnifiedInbox(page = 1, pageSize = 50, flaggedOnly = false) {
+function getUnifiedInbox(page = 1, pageSize = 50, flaggedOnly = false, dateBasis2) {
   abortMessageListRequests();
-  return ipc().getUnifiedInbox(page, pageSize, flaggedOnly);
+  return ipc().getUnifiedInbox(page, pageSize, flaggedOnly, dateBasis2);
 }
 function searchMessages(query, page = 1, pageSize = 50, scope = "all", accountId = "", folderId = 0, includeTrashSpam = false) {
   return ipc().searchMessages(query, page, pageSize, scope, accountId, folderId, includeTrashSpam);
@@ -888,6 +888,213 @@ var init_mailx_types = __esm({
   }
 });
 
+// client/components/address-book.js
+var address_book_exports = {};
+__export(address_book_exports, {
+  openAddressBook: () => openAddressBook
+});
+async function openAddressBook(prefillSearch) {
+  if (isOpen)
+    return;
+  isOpen = true;
+  const backdrop = document.createElement("div");
+  backdrop.className = "mailx-modal-backdrop";
+  const panel = document.createElement("div");
+  panel.className = "mailx-modal mailx-modal-wide";
+  panel.innerHTML = `
+        <div class="mailx-modal-title">
+            <span class="mailx-modal-title-text">Address Book</span>
+            <button type="button" class="mailx-modal-close" id="ab-close" title="Close (Esc)" aria-label="Close">&times;</button>
+        </div>
+        <div class="ab-toolbar">
+            <input type="search" id="ab-search" class="mailx-modal-input" placeholder="Search name or email\u2026" autocomplete="off">
+            <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" id="ab-new">+ New contact</button>
+        </div>
+        <div class="ab-count" id="ab-count"></div>
+        <div class="ab-list" id="ab-list">Loading\u2026</div>
+        <div class="mailx-modal-buttons">
+            <span class="mailx-modal-spacer"></span>
+            <button type="button" class="mailx-modal-btn" data-action="close">Close</button>
+        </div>`;
+  backdrop.appendChild(panel);
+  document.body.appendChild(backdrop);
+  const searchInput2 = panel.querySelector("#ab-search");
+  const listEl = panel.querySelector("#ab-list");
+  const countEl = panel.querySelector("#ab-count");
+  let editingEmail = null;
+  const render2 = (items, total) => {
+    countEl.textContent = total === items.length ? `${total} contact${total === 1 ? "" : "s"}` : `Showing ${items.length} of ${total}`;
+    if (items.length === 0) {
+      listEl.innerHTML = `<div class="ab-empty">No contacts match.</div>`;
+      return;
+    }
+    const fmtDate = (ms) => {
+      if (!ms)
+        return "";
+      const d = new Date(ms);
+      const now = /* @__PURE__ */ new Date();
+      return d.getFullYear() === now.getFullYear() ? d.toLocaleDateString(void 0, { month: "short", day: "numeric" }) : d.toLocaleDateString();
+    };
+    listEl.innerHTML = `
+            <div class="ab-row ab-header">
+                <span class="ab-name">Name</span>
+                <span class="ab-email">Email</span>
+                <span class="ab-source">Source</span>
+                <span class="ab-count-cell" title="Times sent to">\xD7</span>
+                <span class="ab-last">Last</span>
+                <span class="ab-actions"></span>
+            </div>` + items.map((c) => `
+            <div class="ab-row" data-email="${escapeAttr(c.email)}">
+                <span class="ab-name">${escapeHtml(c.name || "")}</span>
+                <span class="ab-email">${escapeHtml(c.email)}</span>
+                <span class="ab-source">${escapeHtml(c.source)}</span>
+                <span class="ab-count-cell">${c.useCount || 0}</span>
+                <span class="ab-last">${fmtDate(c.lastUsed)}</span>
+                <span class="ab-actions">
+                    <button type="button" class="ab-edit" title="Edit name">\u270E</button>
+                    <button type="button" class="ab-del" title="Delete">\u{1F5D1}</button>
+                    <button type="button" class="ab-mail" title="Compose to">\u2709</button>
+                </span>
+            </div>`).join("");
+    listEl.querySelectorAll(".ab-row[data-email]").forEach((row) => {
+      const email = row.dataset.email;
+      const c = items.find((x) => x.email === email);
+      row.querySelector(".ab-edit")?.addEventListener("click", () => beginEdit(row, c));
+      row.querySelector(".ab-del")?.addEventListener("click", () => doDelete(c));
+      row.querySelector(".ab-mail")?.addEventListener("click", () => composeTo(c));
+    });
+  };
+  const beginEdit = (row, c) => {
+    if (editingEmail === c.email)
+      return;
+    editingEmail = c.email;
+    const nameSpan = row.querySelector(".ab-name");
+    const original = c.name || "";
+    nameSpan.innerHTML = `<input type="text" value="${escapeAttr(original)}" class="ab-name-input">`;
+    const inp = nameSpan.querySelector("input");
+    inp.focus();
+    inp.select();
+    const commit = async () => {
+      const newName = inp.value.trim();
+      if (newName !== original) {
+        try {
+          await upsertContact(newName, c.email);
+          c.name = newName;
+        } catch (e) {
+          alert(`Update failed: ${e?.message || e}`);
+        }
+      }
+      nameSpan.textContent = c.name || "";
+      editingEmail = null;
+    };
+    inp.addEventListener("blur", commit);
+    inp.addEventListener("keydown", (e) => {
+      if (e.key === "Enter") {
+        e.preventDefault();
+        inp.blur();
+      } else if (e.key === "Escape") {
+        e.preventDefault();
+        inp.value = original;
+        inp.blur();
+      }
+    });
+  };
+  const doDelete = async (c) => {
+    if (!confirm(`Delete contact "${c.name || c.email}"?`))
+      return;
+    try {
+      await deleteContact(c.email);
+      await reload();
+    } catch (e) {
+      alert(`Delete failed: ${e?.message || e}`);
+    }
+  };
+  const composeTo = (c) => {
+    const init = {
+      mode: "new",
+      to: [{ name: c.name || "", address: c.email }],
+      cc: [],
+      bcc: [],
+      subject: "",
+      bodyHtml: "",
+      inReplyTo: "",
+      references: [],
+      accounts: []
+    };
+    try {
+      sessionStorage.setItem("composeInit", JSON.stringify(init));
+    } catch {
+    }
+    document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "new" } }));
+    close();
+  };
+  let reloadDebounce;
+  const reload = async () => {
+    try {
+      const r = await listContacts(searchInput2.value, 1, 200);
+      render2(r.items, r.total);
+    } catch (e) {
+      listEl.innerHTML = `<div class="ab-empty">Load failed: ${escapeHtml(e?.message || String(e))}</div>`;
+    }
+  };
+  const scheduleReload = () => {
+    if (reloadDebounce)
+      window.clearTimeout(reloadDebounce);
+    reloadDebounce = window.setTimeout(reload, 200);
+  };
+  panel.querySelector("#ab-new")?.addEventListener("click", async () => {
+    const email = prompt("Email address:");
+    if (!email)
+      return;
+    const name = prompt("Display name (optional):") || "";
+    try {
+      await upsertContact(name, email.trim());
+      await reload();
+    } catch (e) {
+      alert(`Add failed: ${e?.message || e}`);
+    }
+  });
+  searchInput2.addEventListener("input", scheduleReload);
+  if (prefillSearch)
+    searchInput2.value = prefillSearch;
+  const close = () => {
+    if (reloadDebounce)
+      window.clearTimeout(reloadDebounce);
+    backdrop.remove();
+    document.removeEventListener("keydown", onKey, true);
+    isOpen = false;
+  };
+  const onKey = (e) => {
+    if (e.key === "Escape") {
+      e.stopPropagation();
+      e.preventDefault();
+      close();
+    }
+  };
+  document.addEventListener("keydown", onKey, true);
+  panel.querySelector("#ab-close").addEventListener("click", close);
+  panel.querySelector('[data-action="close"]').addEventListener("click", close);
+  backdrop.addEventListener("mousedown", (e) => {
+    if (e.target === backdrop)
+      close();
+  });
+  await reload();
+}
+function escapeHtml(s) {
+  return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
+}
+function escapeAttr(s) {
+  return escapeHtml(s);
+}
+var isOpen;
+var init_address_book = __esm({
+  "client/components/address-book.js"() {
+    "use strict";
+    init_api_client();
+    isOpen = false;
+  }
+});
+
 // client/components/message-viewer.js
 function parsedCacheGet(accountId, folderId, uid) {
   if (folderId == null)
@@ -1317,7 +1524,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
     }
     if (!cachedMsg) {
       const previewText = (cached.preview || "").trim();
-      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml(previewText)}</div>` : `<div class="mv-empty">Loading body\u2026</div>`;
+      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml2(previewText)}</div>` : `<div class="mv-empty">Loading body\u2026</div>`;
     }
   } else if (!cachedMsg) {
     bodyEl.innerHTML = `<div class="mv-empty">Loading body\u2026</div>`;
@@ -1346,7 +1553,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       const previewText = (msg.preview || cached?.preview || "").trim();
       const waitStart = Date.now();
       const indicatorHtml = `<span class="mv-wait-elapsed" data-start="${waitStart}">(0s)</span>`;
-      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml(previewText)}<div class="mv-tear-line" aria-label="snippet ends here, full message loading"><span>\u2702 snippet \u2014 fetching full message \u2702</span></div><div class="mv-wait-line">Fetching body from server\u2026 ${indicatorHtml}</div></div>` : `<div class="mv-empty">Fetching body from server\u2026 ${indicatorHtml}</div>`;
+      bodyEl.innerHTML = previewText ? `<div class="mv-preview-placeholder">${escapeHtml2(previewText)}<div class="mv-tear-line" aria-label="snippet ends here, full message loading"><span>\u2702 snippet \u2014 fetching full message \u2702</span></div><div class="mv-wait-line">Fetching body from server\u2026 ${indicatorHtml}</div></div>` : `<div class="mv-empty">Fetching body from server\u2026 ${indicatorHtml}</div>`;
       const captureGen = gen;
       const tick = setInterval(() => {
         if (captureGen !== showMessageGeneration) {
@@ -1450,6 +1657,13 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
           if (name) {
             items.push({ label: `Copy both: ${both}`, action: () => navigator.clipboard.writeText(both) });
           }
+          items.push({
+            label: `Open in contacts: ${addr.address}`,
+            action: async () => {
+              const { openAddressBook: openAddressBook2 } = await Promise.resolve().then(() => (init_address_book(), address_book_exports));
+              await openAddressBook2(addr.address);
+            }
+          });
           items.push({
             label: `Add to contacts: ${addr.address}`,
             action: async () => {
@@ -1828,7 +2042,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         bodyEl.innerHTML = `<div class="mv-system-message mv-system-error">
                     <div class="mv-system-tag">mailx</div>
                     <div class="mv-system-title">Body fetch failed</div>
-                    <div class="mv-system-body">${escapeHtml(fetchErr.error)}<br><span style="color:var(--color-text-muted);font-size:0.9em">Recorded ${Math.round((Date.now() - fetchErr.when) / 1e3)}s ago. ${fetchErr.transient ? "Will retry automatically." : "Permanent \u2014 server-side delete may have raced."}</span></div>
+                    <div class="mv-system-body">${escapeHtml2(fetchErr.error)}<br><span style="color:var(--color-text-muted);font-size:0.9em">Recorded ${Math.round((Date.now() - fetchErr.when) / 1e3)}s ago. ${fetchErr.transient ? "Will retry automatically." : "Permanent \u2014 server-side delete may have raced."}</span></div>
                 </div>`;
       } else {
         const emlPath = msg.emlPath || "";
@@ -1837,8 +2051,8 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         const headline = attCount > 0 ? "This message has attachments but no body text." : "This message has no body text \u2014 only a subject.";
         const crumbs = `mailx${appVer ? " " + appVer : ""} \xB7 ${accountId}/${uid}${emlPath ? " \xB7 " + emlPath : ""}`;
         bodyEl.innerHTML = `<div class="mv-system-message">
-                    <div class="mv-system-body">${escapeHtml(headline)}</div>
-                    <div class="mv-system-body" style="color:var(--color-text-muted);font-size:0.8em;margin-top:8px">${escapeHtml(crumbs)}</div>
+                    <div class="mv-system-body">${escapeHtml2(headline)}</div>
+                    <div class="mv-system-body" style="color:var(--color-text-muted);font-size:0.8em;margin-top:8px">${escapeHtml2(crumbs)}</div>
                 </div>`;
       }
     }
@@ -2037,7 +2251,7 @@ function renderHeaderFromEnvelope(headerEl, env) {
     }
   }
 }
-function escapeHtml(s) {
+function escapeHtml2(s) {
   return (s || "").replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 }
 function linkifyText(text) {
@@ -2791,6 +3005,7 @@ __export(message_list_exports, {
   clearSearchMode: () => clearSearchMode,
   exitMultiSelect: () => exitMultiSelect,
   getCurrentFocused: () => getCurrentFocused,
+  getDateBasis: () => getDateBasis,
   getSelectedMessages: () => getSelectedMessages,
   initMessageList: () => initMessageList,
   loadMessages: () => loadMessages,
@@ -2804,6 +3019,7 @@ __export(message_list_exports, {
   revealMessage: () => revealMessage,
   scrollFocusedIntoView: () => scrollFocusedIntoView,
   selectAllVisible: () => selectAllVisible,
+  setDateBasis: () => setDateBasis,
   setLiveFilter: () => setLiveFilter,
   setRowFlagged: () => setRowFlagged,
   setRowSeen: () => setRowSeen,
@@ -2834,6 +3050,23 @@ function emptyListMessage() {
   }
   return "No messages";
 }
+function effectiveDate(msg) {
+  return dateBasis === "received" ? msg.date : msg.sentDate ?? msg.date;
+}
+function getDateBasis() {
+  return dateBasis;
+}
+function setDateBasis(basis) {
+  if (basis === dateBasis)
+    return;
+  dateBasis = basis;
+  try {
+    localStorage.setItem("mailx-date-basis", basis);
+  } catch {
+  }
+  listCache.clear();
+  reloadCurrentFolder();
+}
 function cacheKey(mode, a, f, flagged, q) {
   if (mode === "folder")
     return `folder:${a}:${f}:${flagged ? "flag" : ""}`;
@@ -2864,12 +3097,14 @@ function withScrollAnchor(body, doRender) {
   const wasAtTop = scrollTop < 4;
   let anchorUuid = "";
   let anchorOffsetWithinViewport = 0;
+  let anchoredOnSelected = false;
   const selected = body.querySelector(".ml-row.selected");
   if (selected) {
     const vt = selected.offsetTop - scrollTop;
     if (vt > -selected.offsetHeight && vt < viewportH) {
       anchorUuid = selected.dataset.uuid || "";
       anchorOffsetWithinViewport = vt;
+      anchoredOnSelected = true;
     }
   }
   if (!anchorUuid) {
@@ -2892,7 +3127,7 @@ function withScrollAnchor(body, doRender) {
     return;
   const after = body.querySelector(`.ml-row[data-uuid="${CSS.escape(anchorUuid)}"]`);
   if (after) {
-    if (wasAtTop && after.offsetTop < viewportH - after.offsetHeight) {
+    if (wasAtTop && !anchoredOnSelected && after.offsetTop < viewportH - after.offsetHeight) {
       body.scrollTop = 0;
     } else {
       body.scrollTop = after.offsetTop - anchorOffsetWithinViewport;
@@ -2915,7 +3150,7 @@ function rememberPosition() {
   positionMemory.set(key, { uid, uuid: sel.dataset.uuid || "", scroll: body.scrollTop });
   persistPositions();
 }
-function pickRestoreUid(items, saved) {
+function pickRestoreUid(items, saved, allowNeighbor = true) {
   if (!items.length)
     return null;
   if (saved.uuid) {
@@ -2923,6 +3158,8 @@ function pickRestoreUid(items, saved) {
     if (exact?.uuid)
       return exact.uuid;
   }
+  if (!allowNeighbor)
+    return null;
   let best = null;
   for (const m of items) {
     if (typeof m.uid !== "number" || !m.uuid)
@@ -3265,6 +3502,24 @@ function exitMultiSelect() {
   updateBulkBar();
 }
 function updateBulkBar() {
+  const panel = document.getElementById("message-list");
+  if (!panel)
+    return;
+  const body = document.getElementById("ml-body");
+  const count = body?.classList.contains("multi-select-on") ? body.querySelectorAll(".ml-row.selected").length : 0;
+  let pill = document.getElementById("ml-select-count");
+  if (count >= 2) {
+    if (!pill) {
+      pill = document.createElement("div");
+      pill.id = "ml-select-count";
+      pill.className = "ml-select-count";
+      panel.appendChild(pill);
+    }
+    pill.textContent = `${count} selected`;
+    pill.style.display = "";
+  } else if (pill) {
+    pill.style.display = "none";
+  }
 }
 function selectAllVisible() {
   const body = document.getElementById("ml-body");
@@ -3325,22 +3580,7 @@ function initMessageList(handler) {
       }
     }, { passive: true });
     body.addEventListener("scroll", () => {
-      if (loading)
-        return;
-      const nearBottom = body.scrollHeight - body.scrollTop - body.clientHeight < 1e3;
-      if (nearBottom) {
-        if (currentPage * 50 < totalMessages) {
-          loadMoreMessages();
-        } else {
-          if (!body._mlScrollEndLogged) {
-            body._mlScrollEndLogged = true;
-            const rows = body.querySelectorAll(".ml-row").length;
-            console.log(`  [ml-scroll] reached bottom \u2014 currentPage=${currentPage} pageSize=50 loadedRows=${rows} totalMessages=${totalMessages} searchMode=${searchMode} unifiedMode=${unifiedMode} flaggedOnly=${body.classList.contains("flagged-only")}`);
-          }
-        }
-      } else {
-        body._mlScrollEndLogged = false;
-      }
+      maybeLoadMore(body);
     });
   }
   document.addEventListener("mailx-remove-stale", (e) => {
@@ -3484,7 +3724,7 @@ async function loadUnifiedInbox(autoSelect = true) {
       withScrollAnchor(body, renderCached);
     else
       renderCached();
-    const targetUuid = remembered ? pickRestoreUid(cached.items, remembered) : null;
+    const targetUuid = remembered ? pickRestoreUid(cached.items, remembered, autoSelect) : null;
     if (targetUuid) {
       if (autoSelect)
         body.scrollTop = savedScroll;
@@ -3496,7 +3736,7 @@ async function loadUnifiedInbox(autoSelect = true) {
     body.innerHTML = `<div class="ml-empty">Loading...</div>`;
   }
   try {
-    const result = await getUnifiedInbox(1, 50, flaggedOnly);
+    const result = await getUnifiedInbox(1, 50, flaggedOnly, dateBasis);
     if (myGen !== loadGen)
       return;
     totalMessages = result.total;
@@ -3510,7 +3750,7 @@ async function loadUnifiedInbox(autoSelect = true) {
     }
     setMessages(result.items);
     withScrollAnchor(body, () => renderMessages(body, "", result.items, { background: !autoSelect }));
-    const targetUuid = remembered ? pickRestoreUid(result.items, remembered) : null;
+    const targetUuid = remembered ? pickRestoreUid(result.items, remembered, autoSelect) : null;
     if (targetUuid) {
       if (!cached)
         body.scrollTop = savedScroll;
@@ -3564,7 +3804,7 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
         body.innerHTML = `<div class="ml-empty">Invalid regex</div>`;
         return;
       }
-      const source = scope === "current" && accountId ? await getMessages(accountId, folderId, 1, 1e4) : await getUnifiedInbox(1, 1e4);
+      const source = scope === "current" && accountId ? await getMessages(accountId, folderId, 1, 1e4, false, currentSort, currentSortDir, dateBasis) : await getUnifiedInbox(1, 1e4, false, dateBasis);
       if (myGen !== loadGen)
         return;
       const matches = source.items.filter((m) => regex.test(m.subject || "") || regex.test(m.from?.name || "") || regex.test(m.from?.address || "") || regex.test(m.preview || ""));
@@ -3637,7 +3877,7 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
       withScrollAnchor(body, renderCached);
     else
       renderCached();
-    const targetUuid = remembered ? pickRestoreUid(cached.items, remembered) : null;
+    const targetUuid = remembered ? pickRestoreUid(cached.items, remembered, autoSelect) : null;
     if (focusUid != null) {
       requestAnimationFrame(() => {
         if (!focusByIdentity(accountId, focusUid, { scroll: true }) && autoSelect)
@@ -3656,7 +3896,7 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
     body.innerHTML = `<div class="ml-empty">Loading...</div>`;
   }
   try {
-    const result = await getMessages(accountId, folderId, 1, 50, flaggedOnly, currentSort, currentSortDir);
+    const result = await getMessages(accountId, folderId, 1, 50, flaggedOnly, currentSort, currentSortDir, dateBasis);
     if (myGen !== loadGen)
       return;
     totalMessages = result.total;
@@ -3680,7 +3920,7 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
         focusedRow = null;
       }
     }
-    const targetUuid = remembered ? pickRestoreUid(result.items, remembered) : null;
+    const targetUuid = remembered ? pickRestoreUid(result.items, remembered, autoSelect) : null;
     if (focusUid != null) {
       requestAnimationFrame(() => {
         if (myGen !== loadGen)
@@ -3707,6 +3947,22 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
     body.innerHTML = `<div class="ml-empty">Error: ${e.message}</div>`;
   }
 }
+function maybeLoadMore(body) {
+  if (loading)
+    return;
+  const nearBottom = body.scrollHeight - body.scrollTop - body.clientHeight < 1e3;
+  if (!nearBottom) {
+    body._mlScrollEndLogged = false;
+    return;
+  }
+  if (currentPage * 50 < totalMessages) {
+    loadMoreMessages();
+  } else if (!body._mlScrollEndLogged) {
+    body._mlScrollEndLogged = true;
+    const rows = body.querySelectorAll(".ml-row").length;
+    console.log(`  [ml-scroll] reached bottom \u2014 currentPage=${currentPage} pageSize=50 loadedRows=${rows} totalMessages=${totalMessages} searchMode=${searchMode} unifiedMode=${unifiedMode} flaggedOnly=${body.classList.contains("flagged-only")}`);
+  }
+}
 async function loadMoreMessages() {
   const body = document.getElementById("ml-body");
   if (!body)
@@ -3718,7 +3974,7 @@ async function loadMoreMessages() {
   const rowsBefore = body.querySelectorAll(".ml-row").length;
   try {
     const flaggedOnly = body.classList.contains("flagged-only");
-    const result = searchMode ? await searchMessages(currentSearchQuery, currentPage) : unifiedMode ? await getUnifiedInbox(currentPage, 50, flaggedOnly) : await getMessages(currentAccountId2, currentFolderId, currentPage, 50, flaggedOnly);
+    const result = searchMode ? await searchMessages(currentSearchQuery, currentPage) : unifiedMode ? await getUnifiedInbox(currentPage, 50, flaggedOnly, dateBasis) : await getMessages(currentAccountId2, currentFolderId, currentPage, 50, flaggedOnly, currentSort, currentSortDir, dateBasis);
     const current = getMessages2();
     setMessages([...current, ...result.items]);
     appendMessages(body, unifiedMode ? "" : currentAccountId2, result.items);
@@ -3732,6 +3988,7 @@ async function loadMoreMessages() {
   } finally {
     loading = false;
   }
+  requestAnimationFrame(() => maybeLoadMore(body));
 }
 function renderMessages(body, accountId, items, opts = {}) {
   const preserveSel = body.classList.contains("multi-select-on") ? new Set(Array.from(body.querySelectorAll(".ml-row.selected")).map((r) => r.dataset.uuid || "").filter(Boolean)) : null;
@@ -3745,6 +4002,7 @@ function renderMessages(body, accountId, items, opts = {}) {
     for (const uuid of preserveSel) {
       body.querySelector(`.ml-row[data-uuid="${CSS.escape(uuid)}"]`)?.classList.add("selected");
     }
+    updateBulkBar();
   }
   try {
     maybeShowFilterEmptyState(body);
@@ -3778,7 +4036,8 @@ function restoreSelection(body, savedUuid) {
   const accountId = row.dataset.accountId;
   const uid = Number(row.dataset.uid);
   if (accountId && Number.isFinite(uid)) {
-    focusByIdentity(accountId, uid, { scroll: false });
+    const switching = focusedRow?.msg?.uuid !== savedUuid;
+    focusByIdentity(accountId, uid, { scroll: switching });
   }
 }
 async function showThreadPopup(pillEl, headMsg) {
@@ -3803,7 +4062,7 @@ async function showThreadPopup(pillEl, headMsg) {
     from.textContent = msg.from?.name || msg.from?.address || "?";
     const date = document.createElement("span");
     date.className = "ml-thread-popup-date";
-    date.textContent = formatDate(msg.date);
+    date.textContent = formatDate(effectiveDate(msg));
     const subject = document.createElement("span");
     subject.className = "ml-thread-popup-subject";
     subject.textContent = msg.subject || "(no subject)";
@@ -3927,12 +4186,12 @@ function formatDate(epochMs) {
     return d.toLocaleString(void 0, dateFmtSameYear);
   return d.toLocaleString(void 0, dateFmt);
 }
-function escapeHtml2(s) {
+function escapeHtml3(s) {
   const div = document.createElement("div");
   div.textContent = s;
   return div.innerHTML;
 }
-var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, unifiedMode, searchMode, liveFilterText, currentSearchQuery, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, lastPointerWasTouch, currentSort, currentSortDir, loadGen, listCache, CACHE_KEY_UNIFIED, positionMemory, POSITION_STORAGE_KEY, focusedRow, rowByKey, prioritySenders, priorityDomains, timeFmt, dateFmt, dateFmtSameYear, MessageRow;
+var onMessageSelect, currentAccountId2, currentFolderId, currentSpecialUse, lastClickedRow, currentPage, totalMessages, loading, unifiedMode, searchMode, liveFilterText, currentSearchQuery, wasUnifiedBeforeSearch, showToInsteadOfFrom, touchWasScroll, lastPointerWasTouch, currentSort, currentSortDir, dateBasis, loadGen, listCache, CACHE_KEY_UNIFIED, positionMemory, POSITION_STORAGE_KEY, focusedRow, rowByKey, prioritySenders, priorityDomains, timeFmt, dateFmt, dateFmtSameYear, MessageRow;
 var init_message_list = __esm({
   "client/components/message-list.js"() {
     "use strict";
@@ -3960,6 +4219,7 @@ var init_message_list = __esm({
     }
     currentSort = "date";
     currentSortDir = "desc";
+    dateBasis = localStorage.getItem("mailx-date-basis") || "sent";
     loadGen = 0;
     listCache = /* @__PURE__ */ new Map();
     CACHE_KEY_UNIFIED = "unified";
@@ -4078,7 +4338,7 @@ var init_message_list = __esm({
         }
         const subject = document.createElement("span");
         subject.className = "ml-subject";
-        subject.innerHTML = escapeHtml2(msg.subject);
+        subject.innerHTML = escapeHtml3(msg.subject);
         if (threadHead && threadCount > 1 && msg.threadId) {
           const threadPill = document.createElement("span");
           threadPill.className = "ml-thread-pill";
@@ -4104,7 +4364,8 @@ var init_message_list = __esm({
         renderStatusIcons(icons, msg);
         const dateText = document.createElement("span");
         dateText.className = "ml-date-text";
-        dateText.textContent = formatDate(msg.date);
+        dateText.textContent = formatDate(effectiveDate(msg));
+        dateText.title = dateBasis === "received" ? "Received date" : "Sent date";
         date.appendChild(icons);
         date.appendChild(dateText);
         row.appendChild(avatar);
@@ -4304,6 +4565,13 @@ var init_message_list = __esm({
         if (e.ctrlKey || e.metaKey) {
           this.setSelected(!this.isSelected);
           lastClickedRow = this.el;
+          if (body) {
+            const n = body.querySelectorAll(".ml-row.selected").length;
+            if (n >= 1)
+              body.classList.add("multi-select-on");
+            else
+              body.classList.remove("multi-select-on");
+          }
         } else {
           clearSelection();
           focusRow(this);
@@ -4507,9 +4775,9 @@ __export(outbox_view_exports, {
   openOutboxView: () => openOutboxView
 });
 async function openOutboxView() {
-  if (isOpen)
+  if (isOpen2)
     return;
-  isOpen = true;
+  isOpen2 = true;
   const backdrop = document.createElement("div");
   backdrop.className = "mailx-modal-backdrop";
   const panel = document.createElement("div");
@@ -4550,19 +4818,19 @@ async function openOutboxView() {
       return `
             <div class="ob-row ob-pink" data-idx="${i}">
                 <div class="ob-row-hdr">
-                    <span class="ob-acct">${escapeHtml3(m.accountId)}</span>
-                    <span class="ob-subject">${escapeHtml3(m.subject || "(no subject)")}</span>
+                    <span class="ob-acct">${escapeHtml4(m.accountId)}</span>
+                    <span class="ob-subject">${escapeHtml4(m.subject || "(no subject)")}</span>
                     <span class="ob-created">${fmtDate(m.createdAt)}</span>
                     ${claimBadge}
                     ${m.attempts > 0 ? `<span class="ob-badge ob-retry" title="Retry attempts made so far">retry \xD7${m.attempts}</span>` : ""}
                 </div>
                 <div class="ob-row-meta">
-                    <span class="ob-from">${escapeHtml3(m.from || "")}</span>
-                    \u2192 <span class="ob-to">${escapeHtml3(m.to || "")}</span>
-                    ${m.cc ? ` \xB7 Cc: ${escapeHtml3(m.cc)}` : ""}
+                    <span class="ob-from">${escapeHtml4(m.from || "")}</span>
+                    \u2192 <span class="ob-to">${escapeHtml4(m.to || "")}</span>
+                    ${m.cc ? ` \xB7 Cc: ${escapeHtml4(m.cc)}` : ""}
                     <span class="ob-size">\xB7 ${(m.sizeBytes / 1024).toFixed(1)}kB</span>
                 </div>
-                <div class="ob-row-path">${escapeHtml3(m.path)}</div>
+                <div class="ob-row-path">${escapeHtml4(m.path)}</div>
                 <div class="ob-row-actions">
                     <button type="button" class="ob-cancel">Cancel</button>
                 </div>
@@ -4598,13 +4866,13 @@ Subject: ${m.subject}`;
       const items = await listQueuedOutgoing();
       renderList(items || []);
     } catch (e) {
-      listEl.innerHTML = `<div class="ob-empty">Load failed: ${escapeHtml3(e?.message || String(e))}</div>`;
+      listEl.innerHTML = `<div class="ob-empty">Load failed: ${escapeHtml4(e?.message || String(e))}</div>`;
     }
   };
   const close = () => {
     backdrop.remove();
     document.removeEventListener("keydown", onKey, true);
-    isOpen = false;
+    isOpen2 = false;
   };
   const onKey = (e) => {
     if (e.key === "Escape") {
@@ -4623,15 +4891,15 @@ Subject: ${m.subject}`;
   });
   await reload();
 }
-function escapeHtml3(s) {
+function escapeHtml4(s) {
   return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 }
-var isOpen;
+var isOpen2;
 var init_outbox_view = __esm({
   "client/components/outbox-view.js"() {
     "use strict";
     init_api_client();
-    isOpen = false;
+    isOpen2 = false;
   }
 });
 
@@ -4662,7 +4930,7 @@ function calendarKind(id, primary) {
 }
 function calIconHtml(info) {
   const kind = calendarKind(info.id, info.primary);
-  const t = escapeHtml4(info.name);
+  const t = escapeHtml5(info.name);
   if (kind === "personal")
     return `<span class="cal-ico cal-ico-dot" title="${t}"></span>`;
   if (kind === "usHoliday")
@@ -4673,9 +4941,9 @@ function calIconHtml(info) {
     return `<span class="cal-ico cal-ico-emoji" title="${t}">\u{1F382}</span>`;
   if (kind === "otherHoliday")
     return `<span class="cal-ico cal-ico-emoji" title="${t}">\u2726</span>`;
-  const letter = escapeHtml4((info.name.trim()[0] || "?").toUpperCase());
+  const letter = escapeHtml5((info.name.trim()[0] || "?").toUpperCase());
   const color = info.color || "#7a7a7a";
-  return `<span class="cal-ico cal-ico-mono" style="background:${escapeHtml4(color)}" title="${t}">${letter}</span>`;
+  return `<span class="cal-ico cal-ico-mono" style="background:${escapeHtml5(color)}" title="${t}">${letter}</span>`;
 }
 function calInfoFor(calendarId) {
   const id = calendarId || "primary";
@@ -4724,10 +4992,10 @@ async function renderCalendarList() {
       host.innerHTML = "";
     } else {
       const sorted = [...list].sort((a, b) => (a.primary ? 0 : 1) - (b.primary ? 0 : 1) || a.name.localeCompare(b.name));
-      host.innerHTML = sorted.map((c) => `<label class="cal-side-cal-row" title="${escapeHtml4(c.name)}">
-                <input type="checkbox" class="cal-side-cal-check" data-cal-id="${escapeHtml4(c.id)}" ${hiddenCalendars.has(c.id) ? "" : "checked"}>
+      host.innerHTML = sorted.map((c) => `<label class="cal-side-cal-row" title="${escapeHtml5(c.name)}">
+                <input type="checkbox" class="cal-side-cal-check" data-cal-id="${escapeHtml5(c.id)}" ${hiddenCalendars.has(c.id) ? "" : "checked"}>
                 ${calIconHtml(c)}
-                <span class="cal-side-cal-name">${escapeHtml4(c.name)}</span>
+                <span class="cal-side-cal-name">${escapeHtml5(c.name)}</span>
             </label>`).join("");
       host.querySelectorAll(".cal-side-cal-check").forEach((cb) => {
         cb.addEventListener("change", async () => {
@@ -4811,7 +5079,7 @@ function formatTime(e) {
     return "all day";
   return new Date(e.start).toLocaleTimeString(void 0, { hour: "2-digit", minute: "2-digit", hour12: false });
 }
-function escapeHtml4(s) {
+function escapeHtml5(s) {
   return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
 }
 function renderHead() {
@@ -4828,10 +5096,10 @@ function overdueTaskRowHtml(t) {
     const sameYear = d.getFullYear() === (/* @__PURE__ */ new Date()).getFullYear();
     dueLabel = sameYear ? `${d.getMonth() + 1}/${d.getDate()}` : d.toISOString().slice(0, 10);
   }
-  return `<div class="cal-side-task cal-side-task-overdue" data-uuid="${escapeHtml4(t.uuid)}">
+  return `<div class="cal-side-task cal-side-task-overdue" data-uuid="${escapeHtml5(t.uuid)}">
         <input type="checkbox" class="cal-side-overdue-check" title="Mark done">
-        <span class="cal-side-task-title" title="${escapeHtml4(t.title)}">${escapeHtml4(t.title)}</span>
-        <span class="cal-side-task-due overdue">${escapeHtml4(dueLabel)}</span>
+        <span class="cal-side-task-title" title="${escapeHtml5(t.title)}">${escapeHtml5(t.title)}</span>
+        <span class="cal-side-task-due overdue">${escapeHtml5(dueLabel)}</span>
     </div>`;
 }
 function renderEvents(events) {
@@ -4888,10 +5156,10 @@ function renderEvents(events) {
     html += `<div class="cal-side-day cal-side-day-daily">Daily</div>`;
     for (const e of dailyHeads) {
       const link = e.htmlLink || "";
-      html += `<div class="cal-side-event" data-id="${e.id}" data-link="${escapeHtml4(link)}" ${link ? 'title="Click to open in Google Calendar"' : ""}>
+      html += `<div class="cal-side-event" data-id="${e.id}" data-link="${escapeHtml5(link)}" ${link ? 'title="Click to open in Google Calendar"' : ""}>
                 ${calIconHtml(calInfoFor(e.calendarId))}
-                <span class="cal-side-event-time">${escapeHtml4(formatTime(e))}</span>
-                <span class="cal-side-event-title" title="${escapeHtml4(e.title)}">${escapeHtml4(e.title)}<span class="cal-side-event-recur" title="Daily">\u21BB</span></span>
+                <span class="cal-side-event-time">${escapeHtml5(formatTime(e))}</span>
+                <span class="cal-side-event-title" title="${escapeHtml5(e.title)}">${escapeHtml5(e.title)}<span class="cal-side-event-recur" title="Daily">\u21BB</span></span>
             </div>`;
     }
   }
@@ -4909,7 +5177,7 @@ function renderEvents(events) {
     const d = new Date(e.start);
     const dayKey = `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
     if (dayKey !== lastDayKey) {
-      html += `<div class="cal-side-day">${escapeHtml4(formatDayHeader(d, today, tomorrow))}</div>`;
+      html += `<div class="cal-side-day">${escapeHtml5(formatDayHeader(d, today, tomorrow))}</div>`;
       lastDayKey = dayKey;
     }
     const recurMark = e.recurringEventId ? `<span class="cal-side-event-recur" title="Recurring event">\u21BB</span>` : "";
@@ -4917,14 +5185,14 @@ function renderEvents(events) {
     const recurAttr = e.recurringEventId ? ' data-recurring="1"' : "";
     if (isHolidayKind || kind === "birthday") {
       html += `<div class="cal-side-event" data-holiday="1" data-holiday-kind="${kind}" data-id="${e.id}">
-                <span class="cal-side-event-title cal-side-event-holiday-title" title="${escapeHtml4(e.title)}">${calIconHtml(info)} ${escapeHtml4(e.title)}</span>
+                <span class="cal-side-event-title cal-side-event-holiday-title" title="${escapeHtml5(e.title)}">${calIconHtml(info)} ${escapeHtml5(e.title)}</span>
             </div>`;
     } else {
       const titleAttr = link ? 'title="Click to open in Google Calendar"' : "";
-      html += `<div class="cal-side-event" data-id="${e.id}"${recurAttr} data-link="${escapeHtml4(link)}" ${titleAttr}>
+      html += `<div class="cal-side-event" data-id="${e.id}"${recurAttr} data-link="${escapeHtml5(link)}" ${titleAttr}>
                 ${calIconHtml(info)}
-                <span class="cal-side-event-time">${escapeHtml4(formatTime(e))}</span>
-                <span class="cal-side-event-title" title="${escapeHtml4(e.title)}">${escapeHtml4(e.title)}${recurMark}</span>
+                <span class="cal-side-event-time">${escapeHtml5(formatTime(e))}</span>
+                <span class="cal-side-event-title" title="${escapeHtml5(e.title)}">${escapeHtml5(e.title)}${recurMark}</span>
             </div>`;
     }
   }
@@ -5009,7 +5277,7 @@ async function renderTasks(prefetched) {
     const sel = selectedTaskUuids.has(t.uuid) ? " selected" : "";
     html += `<div class="cal-side-task${sel}" data-uuid="${t.uuid}">
             <input type="checkbox" ${done ? "checked" : ""} class="cal-side-task-check">
-            <span class="cal-side-task-title${done ? " done" : ""}" title="${escapeHtml4(t.title)}">${escapeHtml4(t.title)}</span>
+            <span class="cal-side-task-title${done ? " done" : ""}" title="${escapeHtml5(t.title)}">${escapeHtml5(t.title)}</span>
             ${dueHtml}
             <button class="cal-side-task-delete" title="Delete task" aria-label="Delete task">\xD7</button>
         </div>`;
@@ -5088,7 +5356,7 @@ async function refresh() {
   } catch (e) {
     const body = document.getElementById("cal-side-body");
     if (body)
-      body.innerHTML = `<div class="cal-side-empty cal-side-quota-error">Couldn't load calendar: ${escapeHtml4(e?.message || String(e))}</div>`;
+      body.innerHTML = `<div class="cal-side-empty cal-side-quota-error">Couldn't load calendar: ${escapeHtml5(e?.message || String(e))}</div>`;
   }
   renderTasks(prefetchedTasks);
 }
@@ -5369,14 +5637,14 @@ function initCalendarSidebar() {
           const host = event.feature === "tasks" ? document.getElementById("cal-side-tasks") : document.getElementById("cal-side-body");
           if (host && !host.querySelector(".cal-side-quota-error")) {
             const msg = event.message || `Google ${event.feature} quota exceeded \u2014 try again later.`;
-            host.innerHTML = `<div class="cal-side-empty cal-side-quota-error">${escapeHtml4(msg)}</div>`;
+            host.innerHTML = `<div class="cal-side-empty cal-side-quota-error">${escapeHtml5(msg)}</div>`;
           }
         } else if (event?.type === "authScopeError") {
           const host = event.feature === "tasks" ? document.getElementById("cal-side-tasks") : document.getElementById("cal-side-body");
           if (host && !host.querySelector(".cal-side-auth-error")) {
             const msg = event.message || "Google access needs re-consent.";
             host.innerHTML = `<div class="cal-side-empty cal-side-auth-error">
-                            <div style="margin-bottom:0.6em">${escapeHtml4(msg)}</div>
+                            <div style="margin-bottom:0.6em">${escapeHtml5(msg)}</div>
                             <button type="button" class="cal-side-reauth-btn" style="padding:0.3em 0.8em;border-radius:4px;border:1px solid currentColor;background:transparent;color:inherit;cursor:pointer;font-size:0.9em">Re-authenticate Now</button>
                         </div>`;
             const btn = host.querySelector(".cal-side-reauth-btn");
@@ -5421,211 +5689,6 @@ var init_calendar_sidebar = __esm({
   }
 });
 
-// client/components/address-book.js
-var address_book_exports = {};
-__export(address_book_exports, {
-  openAddressBook: () => openAddressBook
-});
-async function openAddressBook() {
-  if (isOpen2)
-    return;
-  isOpen2 = true;
-  const backdrop = document.createElement("div");
-  backdrop.className = "mailx-modal-backdrop";
-  const panel = document.createElement("div");
-  panel.className = "mailx-modal mailx-modal-wide";
-  panel.innerHTML = `
-        <div class="mailx-modal-title">
-            <span class="mailx-modal-title-text">Address Book</span>
-            <button type="button" class="mailx-modal-close" id="ab-close" title="Close (Esc)" aria-label="Close">&times;</button>
-        </div>
-        <div class="ab-toolbar">
-            <input type="search" id="ab-search" class="mailx-modal-input" placeholder="Search name or email\u2026" autocomplete="off">
-            <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" id="ab-new">+ New contact</button>
-        </div>
-        <div class="ab-count" id="ab-count"></div>
-        <div class="ab-list" id="ab-list">Loading\u2026</div>
-        <div class="mailx-modal-buttons">
-            <span class="mailx-modal-spacer"></span>
-            <button type="button" class="mailx-modal-btn" data-action="close">Close</button>
-        </div>`;
-  backdrop.appendChild(panel);
-  document.body.appendChild(backdrop);
-  const searchInput2 = panel.querySelector("#ab-search");
-  const listEl = panel.querySelector("#ab-list");
-  const countEl = panel.querySelector("#ab-count");
-  let editingEmail = null;
-  const render2 = (items, total) => {
-    countEl.textContent = total === items.length ? `${total} contact${total === 1 ? "" : "s"}` : `Showing ${items.length} of ${total}`;
-    if (items.length === 0) {
-      listEl.innerHTML = `<div class="ab-empty">No contacts match.</div>`;
-      return;
-    }
-    const fmtDate = (ms) => {
-      if (!ms)
-        return "";
-      const d = new Date(ms);
-      const now = /* @__PURE__ */ new Date();
-      return d.getFullYear() === now.getFullYear() ? d.toLocaleDateString(void 0, { month: "short", day: "numeric" }) : d.toLocaleDateString();
-    };
-    listEl.innerHTML = `
-            <div class="ab-row ab-header">
-                <span class="ab-name">Name</span>
-                <span class="ab-email">Email</span>
-                <span class="ab-source">Source</span>
-                <span class="ab-count-cell" title="Times sent to">\xD7</span>
-                <span class="ab-last">Last</span>
-                <span class="ab-actions"></span>
-            </div>` + items.map((c) => `
-            <div class="ab-row" data-email="${escapeAttr(c.email)}">
-                <span class="ab-name">${escapeHtml5(c.name || "")}</span>
-                <span class="ab-email">${escapeHtml5(c.email)}</span>
-                <span class="ab-source">${escapeHtml5(c.source)}</span>
-                <span class="ab-count-cell">${c.useCount || 0}</span>
-                <span class="ab-last">${fmtDate(c.lastUsed)}</span>
-                <span class="ab-actions">
-                    <button type="button" class="ab-edit" title="Edit name">\u270E</button>
-                    <button type="button" class="ab-del" title="Delete">\u{1F5D1}</button>
-                    <button type="button" class="ab-mail" title="Compose to">\u2709</button>
-                </span>
-            </div>`).join("");
-    listEl.querySelectorAll(".ab-row[data-email]").forEach((row) => {
-      const email = row.dataset.email;
-      const c = items.find((x) => x.email === email);
-      row.querySelector(".ab-edit")?.addEventListener("click", () => beginEdit(row, c));
-      row.querySelector(".ab-del")?.addEventListener("click", () => doDelete(c));
-      row.querySelector(".ab-mail")?.addEventListener("click", () => composeTo(c));
-    });
-  };
-  const beginEdit = (row, c) => {
-    if (editingEmail === c.email)
-      return;
-    editingEmail = c.email;
-    const nameSpan = row.querySelector(".ab-name");
-    const original = c.name || "";
-    nameSpan.innerHTML = `<input type="text" value="${escapeAttr(original)}" class="ab-name-input">`;
-    const inp = nameSpan.querySelector("input");
-    inp.focus();
-    inp.select();
-    const commit = async () => {
-      const newName = inp.value.trim();
-      if (newName !== original) {
-        try {
-          await upsertContact(newName, c.email);
-          c.name = newName;
-        } catch (e) {
-          alert(`Update failed: ${e?.message || e}`);
-        }
-      }
-      nameSpan.textContent = c.name || "";
-      editingEmail = null;
-    };
-    inp.addEventListener("blur", commit);
-    inp.addEventListener("keydown", (e) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        inp.blur();
-      } else if (e.key === "Escape") {
-        e.preventDefault();
-        inp.value = original;
-        inp.blur();
-      }
-    });
-  };
-  const doDelete = async (c) => {
-    if (!confirm(`Delete contact "${c.name || c.email}"?`))
-      return;
-    try {
-      await deleteContact(c.email);
-      await reload();
-    } catch (e) {
-      alert(`Delete failed: ${e?.message || e}`);
-    }
-  };
-  const composeTo = (c) => {
-    const init = {
-      mode: "new",
-      to: [{ name: c.name || "", address: c.email }],
-      cc: [],
-      bcc: [],
-      subject: "",
-      bodyHtml: "",
-      inReplyTo: "",
-      references: [],
-      accounts: []
-    };
-    try {
-      sessionStorage.setItem("composeInit", JSON.stringify(init));
-    } catch {
-    }
-    document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "new" } }));
-    close();
-  };
-  let reloadDebounce;
-  const reload = async () => {
-    try {
-      const r = await listContacts(searchInput2.value, 1, 200);
-      render2(r.items, r.total);
-    } catch (e) {
-      listEl.innerHTML = `<div class="ab-empty">Load failed: ${escapeHtml5(e?.message || String(e))}</div>`;
-    }
-  };
-  const scheduleReload = () => {
-    if (reloadDebounce)
-      window.clearTimeout(reloadDebounce);
-    reloadDebounce = window.setTimeout(reload, 200);
-  };
-  panel.querySelector("#ab-new")?.addEventListener("click", async () => {
-    const email = prompt("Email address:");
-    if (!email)
-      return;
-    const name = prompt("Display name (optional):") || "";
-    try {
-      await upsertContact(name, email.trim());
-      await reload();
-    } catch (e) {
-      alert(`Add failed: ${e?.message || e}`);
-    }
-  });
-  searchInput2.addEventListener("input", scheduleReload);
-  const close = () => {
-    if (reloadDebounce)
-      window.clearTimeout(reloadDebounce);
-    backdrop.remove();
-    document.removeEventListener("keydown", onKey, true);
-    isOpen2 = false;
-  };
-  const onKey = (e) => {
-    if (e.key === "Escape") {
-      e.stopPropagation();
-      e.preventDefault();
-      close();
-    }
-  };
-  document.addEventListener("keydown", onKey, true);
-  panel.querySelector("#ab-close").addEventListener("click", close);
-  panel.querySelector('[data-action="close"]').addEventListener("click", close);
-  backdrop.addEventListener("mousedown", (e) => {
-    if (e.target === backdrop)
-      close();
-  });
-  await reload();
-}
-function escapeHtml5(s) {
-  return s.replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]);
-}
-function escapeAttr(s) {
-  return escapeHtml5(s);
-}
-var isOpen2;
-var init_address_book = __esm({
-  "client/components/address-book.js"() {
-    "use strict";
-    init_api_client();
-    isOpen2 = false;
-  }
-});
-
 // client/components/alarms.js
 var alarms_exports = {};
 __export(alarms_exports, {
@@ -6371,6 +6434,14 @@ var refreshDebounceTimer = null;
 var DRAG_HOVER_EXPAND_MS = 600;
 var dragAutoExpanded = /* @__PURE__ */ new Set();
 var dragInFlight = false;
+function collapseDragExpanded() {
+  if (dragAutoExpanded.size === 0)
+    return false;
+  for (const key of dragAutoExpanded)
+    delete expandState[key];
+  dragAutoExpanded.clear();
+  return true;
+}
 var expandState = JSON.parse(localStorage.getItem("mailx-folders-expanded") || "{}");
 function saveExpandState() {
   localStorage.setItem("mailx-folders-expanded", JSON.stringify(expandState));
@@ -6749,6 +6820,14 @@ function renderNode(node, container, depth) {
         clearTimeout(dragExpandTimer);
         dragExpandTimer = null;
       }
+      const springCollapsed = collapseDragExpanded();
+      const rerenderTree = () => {
+        const tc = document.getElementById("folder-tree");
+        if (tc)
+          loadFolderTree(tc);
+      };
+      if (springCollapsed)
+        rerenderTree();
       const folderData = e.dataTransfer.getData("application/x-mailx-folder");
       if (folderData) {
         let src;
@@ -6857,11 +6936,8 @@ document.addEventListener("dragend", () => {
   if (!dragInFlight)
     return;
   dragInFlight = false;
-  if (dragAutoExpanded.size === 0)
+  if (!collapseDragExpanded())
     return;
-  for (const key of dragAutoExpanded)
-    delete expandState[key];
-  dragAutoExpanded.clear();
   const treeContainer = document.getElementById("folder-tree");
   if (treeContainer)
     loadFolderTree(treeContainer);
@@ -9066,6 +9142,9 @@ document.addEventListener("mailx-share-intent", ((e) => {
     if (detail.subject) init.subject = detail.subject;
     if (detail.text) init.bodyHtml = `<p>${escapeHtml7(String(detail.text)).replace(/\n/g, "<br>")}</p>`;
   }
+  if (Array.isArray(detail.attachments) && detail.attachments.length) {
+    init.attachments = detail.attachments.filter((a) => a?.filename && a?.dataBase64);
+  }
   sessionStorage.setItem("composeInit", JSON.stringify(init));
   showComposeOverlay(init.subject || "Compose");
 }));
@@ -11204,6 +11283,19 @@ optThreaded?.addEventListener("change", () => {
   localStorage.setItem("mailx-threaded", String(optThreaded.checked));
   reloadCurrentFolder();
 });
+var optDateSent = document.getElementById("opt-date-sent");
+var optDateReceived = document.getElementById("opt-date-received");
+(function initDateBasisRadios() {
+  const basis = getDateBasis();
+  if (optDateSent) optDateSent.checked = basis === "sent";
+  if (optDateReceived) optDateReceived.checked = basis === "received";
+})();
+optDateSent?.addEventListener("change", () => {
+  if (optDateSent.checked) setDateBasis("sent");
+});
+optDateReceived?.addEventListener("change", () => {
+  if (optDateReceived.checked) setDateBasis("received");
+});
 function syncFilterFlaggedButton() {
   const btn = document.getElementById("btn-filter-flagged");
   if (!btn) return;