@bobfrankston/rmfmail 1.2.49 → 1.2.65

package/client/app.bundle.js

@@ -370,8 +370,8 @@ function markFolderRead(accountId, folderId) {
 function createFolder(accountId, parentPath, name) {
   return ipc().createFolder?.(accountId, parentPath, name);
 }
-function renameFolder(accountId, folderId, newName) {
-  return ipc().renameFolder?.(accountId, folderId, newName);
+function renameFolder(accountId, folderId, newName, newParentId) {
+  return ipc().renameFolder?.(accountId, folderId, newName, newParentId);
 }
 function deleteFolder(accountId, folderId) {
   return ipc().deleteFolder?.(accountId, folderId);
@@ -2760,10 +2760,12 @@ __export(message_list_exports, {
   releaseFocus: () => releaseFocus,
   reloadCurrentFolder: () => reloadCurrentFolder,
   removeMessagesAndReconcile: () => removeMessagesAndReconcile,
+  revealMessage: () => revealMessage,
   scrollFocusedIntoView: () => scrollFocusedIntoView,
   setLiveFilter: () => setLiveFilter,
   setRowFlagged: () => setRowFlagged,
   setRowSeen: () => setRowSeen,
+  showSelectionMenu: () => showSelectionMenu,
   showThreadPopup: () => showThreadPopup
 });
 function setLiveFilter(query) {
@@ -2784,6 +2786,12 @@ function applyLiveFilter(body) {
     row.classList.toggle("filter-hidden", !text.includes(liveFilterText));
   }
 }
+function emptyListMessage() {
+  if (searchMode && currentSearchQuery) {
+    return `No messages found by "${escapeHtmlText(currentSearchQuery)}"`;
+  }
+  return "No messages";
+}
 function cacheKey(mode, a, f, flagged, q) {
   if (mode === "folder")
     return `folder:${a}:${f}:${flagged ? "flag" : ""}`;
@@ -2961,6 +2969,154 @@ function setRowSeen(accountId, uid, yes) {
   if (row)
     row.setUnreadClass(!yes);
 }
+function selectedRows() {
+  const out = [];
+  for (const s of getSelectedMessages()) {
+    const row = rowByKey.get(rowKey(s.accountId, s.uid));
+    if (row)
+      out.push(row);
+  }
+  return out;
+}
+function visibleRowObjs() {
+  const body = document.getElementById("ml-body");
+  if (!body)
+    return [];
+  return Array.from(body.querySelectorAll(".ml-row:not(.filter-hidden)")).map((el) => rowByKey.get(rowKey(el.dataset.accountId || "", Number(el.dataset.uid)))).filter((r) => !!r);
+}
+function bulkTargets() {
+  const sel = selectedRows();
+  return sel.length > 0 ? sel : visibleRowObjs();
+}
+async function bulkSetFlagged(rows, flagged) {
+  const undo = [];
+  await Promise.all(rows.map(async (row) => {
+    const prev = row.isFlagged;
+    if (prev === flagged)
+      return;
+    const prevFlags = [...row.msg.flags || []];
+    row.isFlagged = flagged;
+    try {
+      await updateFlags(row.accountId, row.msg.uid, row.msg.flags);
+      updateMessageFlags(row.accountId, row.msg.uid, row.msg.flags);
+      undo.push({ accountId: row.accountId, uid: row.msg.uid, prevFlagged: prev });
+    } catch {
+      row.msg.flags = prevFlags;
+      row.setFlaggedClass(prev);
+    }
+  }));
+  if (undo.length)
+    document.dispatchEvent(new CustomEvent("mailx-flagged-batch", { detail: undo }));
+}
+async function bulkSetSeen(rows, seen) {
+  await Promise.all(rows.map(async (row) => {
+    const prev = row.isSeen;
+    if (prev === seen)
+      return;
+    const prevFlags = [...row.msg.flags || []];
+    row.isSeen = seen;
+    try {
+      await updateFlags(row.accountId, row.msg.uid, row.msg.flags);
+      updateMessageFlags(row.accountId, row.msg.uid, row.msg.flags);
+    } catch {
+      row.msg.flags = prevFlags;
+      row.setUnreadClass(!prev);
+    }
+  }));
+}
+async function bulkMoveSelection() {
+  const targets = bulkTargets();
+  if (targets.length === 0)
+    return;
+  const accountId = targets[0].accountId;
+  const same = targets.filter((r) => r.accountId === accountId);
+  const pick = await pickFolder(accountId, { excludeFolderIds: [same[0].msg.folderId] });
+  if (!pick)
+    return;
+  const uids = same.map((r) => r.msg.uid);
+  removeMessagesAndReconcile(uids.map((u) => ({ accountId, uid: u })));
+  const statusSync = document.getElementById("status-sync");
+  if (statusSync)
+    statusSync.textContent = `Moving ${uids.length} message${uids.length !== 1 ? "s" : ""} to ${pick.folderName}\u2026`;
+  moveMessages(accountId, uids, pick.folderId).then(() => {
+    if (statusSync)
+      statusSync.textContent = `Moved ${uids.length} to ${pick.folderName}`;
+  }).catch((err) => {
+    if (statusSync)
+      statusSync.textContent = `Move sync issue: ${err?.message || err}`;
+  });
+  exitMultiSelect();
+}
+async function showSelectionMenu(x, y) {
+  const { showContextMenu: showContextMenu2 } = await Promise.resolve().then(() => (init_context_menu(), context_menu_exports));
+  const body = document.getElementById("ml-body");
+  const visibleRows = body ? Array.from(body.querySelectorAll(".ml-row:not(.filter-hidden)")) : [];
+  const enterMulti = () => body?.classList.add("multi-select-on");
+  const shownCount = visibleRows.length;
+  const selCount = getSelectedMessages().length;
+  const hasShown = shownCount > 0;
+  const targetN = selCount > 0 ? selCount : shownCount;
+  const onWhat = selCount > 0 ? `selected (${selCount})` : `all shown (${shownCount})`;
+  const canAct = targetN > 0;
+  const items = [
+    { label: `Acting on ${onWhat}`, action: () => {
+    }, disabled: true },
+    { label: "", action: () => {
+    }, separator: true },
+    {
+      label: `Select all shown (${shownCount})`,
+      action: () => {
+        if (!body)
+          return;
+        enterMulti();
+        for (const r of visibleRows)
+          r.classList.add("selected");
+        lastClickedRow = visibleRows[visibleRows.length - 1] || null;
+        updateBulkBar();
+      },
+      disabled: !hasShown
+    },
+    {
+      label: "Select flagged \u2605 among shown",
+      action: () => {
+        if (!body)
+          return;
+        enterMulti();
+        for (const r of visibleRows)
+          r.classList.toggle("selected", r.classList.contains("flagged"));
+        lastClickedRow = null;
+        updateBulkBar();
+      },
+      disabled: !hasShown
+    },
+    {
+      label: "Invert selection among shown",
+      action: () => {
+        if (!body)
+          return;
+        enterMulti();
+        for (const r of visibleRows)
+          r.classList.toggle("selected");
+        updateBulkBar();
+      },
+      disabled: !hasShown
+    },
+    { label: `Deselect all (${selCount})`, action: () => exitMultiSelect(), disabled: selCount === 0 },
+    { label: "", action: () => {
+    }, separator: true },
+    // Actions — auto-targeted (selected else all shown). No count on the
+    // verb itself (a number on "Flag" reads as ambiguous, Bob 2026-06-24);
+    // the "Acting on …" header above carries the target count.
+    { label: "Flag", action: () => bulkSetFlagged(bulkTargets(), true), disabled: !canAct },
+    { label: "Unflag", action: () => bulkSetFlagged(bulkTargets(), false), disabled: !canAct },
+    { label: "Mark read", action: () => bulkSetSeen(bulkTargets(), true), disabled: !canAct },
+    { label: "Mark unread", action: () => bulkSetSeen(bulkTargets(), false), disabled: !canAct },
+    { label: "", action: () => {
+    }, separator: true },
+    { label: "Move to folder\u2026", action: () => bulkMoveSelection(), disabled: !canAct }
+  ];
+  showContextMenu2(x, y, items);
+}
 function scrollFocusedIntoView() {
   if (!focusedRow)
     return;
@@ -3216,7 +3372,7 @@ function removeMessagesAndReconcile(uids) {
       }
     }
     if (getMessages2().length === 0) {
-      body.innerHTML = `<div class="ml-empty">No messages</div>`;
+      body.innerHTML = `<div class="ml-empty">${emptyListMessage()}</div>`;
     }
   }
   if (outcome.focusedWasRemoved) {
@@ -3273,10 +3429,15 @@ async function loadUnifiedInbox(autoSelect = true) {
   if (cached) {
     totalMessages = cached.total;
     setMessages(cached.items);
-    renderMessages(body, "", cached.items, { background: !autoSelect });
+    const renderCached = () => renderMessages(body, "", cached.items, { background: !autoSelect });
+    if (!autoSelect)
+      withScrollAnchor(body, renderCached);
+    else
+      renderCached();
     const targetUuid = remembered ? pickRestoreUid(cached.items, remembered) : null;
     if (targetUuid) {
-      body.scrollTop = savedScroll;
+      if (autoSelect)
+        body.scrollTop = savedScroll;
       restoreSelection(body, targetUuid);
     } else if (autoSelect) {
       selectFirst(body);
@@ -3360,7 +3521,7 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
       totalMessages = matches.length;
       setMessages(matches);
       if (matches.length === 0) {
-        body.innerHTML = `<div class="ml-empty">No regex matches</div>`;
+        body.innerHTML = `<div class="ml-empty">No messages found by "${escapeHtmlText(query)}"</div>`;
         return;
       }
       body.innerHTML = "";
@@ -3380,7 +3541,7 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
     const partialNote = partial ? `<div class="ml-search-warning">\u26A0 Searched ${foldersSearched} folder(s); ${foldersFailed} could not be searched (timeout / connection). Results may be incomplete \u2014 retry to search them again.</div>` : "";
     if (result.items.length === 0) {
       setMessages([]);
-      body.innerHTML = partialNote + `<div class="ml-empty">No results for "${query}"${partial ? " in the folders that responded" : ""}</div>`;
+      body.innerHTML = partialNote + `<div class="ml-empty">No messages found by "${escapeHtmlText(query)}"${partial ? " in the folders that responded" : ""}</div>`;
       return;
     }
     setMessages(result.items);
@@ -3391,7 +3552,10 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
     body.innerHTML = `<div class="ml-empty">Search error: ${e.message}</div>`;
   }
 }
-async function loadMessages(accountId, folderId, page = 1, specialUse = "", autoSelect = true) {
+function revealMessage(accountId, folderId, uid, specialUse = "") {
+  loadMessages(accountId, folderId, 1, specialUse, true, uid);
+}
+async function loadMessages(accountId, folderId, page = 1, specialUse = "", autoSelect = true, focusUid) {
   const myGen = ++loadGen;
   searchMode = false;
   unifiedMode = false;
@@ -3418,11 +3582,21 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
   if (cached) {
     totalMessages = cached.total;
     setMessages(cached.items);
-    renderMessages(body, accountId, cached.items, { background: !autoSelect });
+    const renderCached = () => renderMessages(body, accountId, cached.items, { background: !autoSelect });
+    if (!autoSelect)
+      withScrollAnchor(body, renderCached);
+    else
+      renderCached();
     const targetUuid = remembered ? pickRestoreUid(cached.items, remembered) : null;
-    if (targetUuid) {
+    if (focusUid != null) {
       requestAnimationFrame(() => {
-        body.scrollTop = savedScroll;
+        if (!focusByIdentity(accountId, focusUid, { scroll: true }) && autoSelect)
+          selectFirst(body);
+      });
+    } else if (targetUuid) {
+      requestAnimationFrame(() => {
+        if (autoSelect)
+          body.scrollTop = savedScroll;
         restoreSelection(body, targetUuid);
       });
     } else if (autoSelect) {
@@ -3457,7 +3631,14 @@ async function loadMessages(accountId, folderId, page = 1, specialUse = "", auto
       }
     }
     const targetUuid = remembered ? pickRestoreUid(result.items, remembered) : null;
-    if (targetUuid) {
+    if (focusUid != null) {
+      requestAnimationFrame(() => {
+        if (myGen !== loadGen)
+          return;
+        if (!focusByIdentity(accountId, focusUid, { scroll: true }) && autoSelect)
+          selectFirst(body);
+      });
+    } else if (targetUuid) {
       requestAnimationFrame(() => {
         if (myGen !== loadGen)
           return;
@@ -3482,12 +3663,20 @@ async function loadMoreMessages() {
     return;
   loading = true;
   currentPage++;
+  const t0 = Date.now();
+  const heightBefore = body.scrollHeight;
+  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 current = getMessages2();
     setMessages([...current, ...result.items]);
     appendMessages(body, unifiedMode ? "" : currentAccountId2, result.items);
+    const rowsAfter = body.querySelectorAll(".ml-row").length;
+    const heightAfter = body.scrollHeight;
+    const elapsed = Date.now() - t0;
+    const grew = heightAfter > heightBefore;
+    console.log(`  [ml-loadmore] page=${currentPage} got=${result.items?.length ?? 0} rows ${rowsBefore}->${rowsAfter} height ${heightBefore}->${heightAfter} grew=${grew} total=${totalMessages} ${elapsed}ms${grew ? "" : "  \u26A0 NO GROWTH \u2014 scroll will appear stuck"}`);
   } catch (e) {
     console.error(`Load more error: ${e.message}`);
   } finally {
@@ -3495,12 +3684,18 @@ async function loadMoreMessages() {
   }
 }
 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;
   const fragment = document.createDocumentFragment();
   const tempDiv = document.createElement("div");
   appendMessages(tempDiv, accountId, items);
   while (tempDiv.firstChild)
     fragment.appendChild(tempDiv.firstChild);
   body.replaceChildren(fragment);
+  if (preserveSel && preserveSel.size > 0) {
+    for (const uuid of preserveSel) {
+      body.querySelector(`.ml-row[data-uuid="${CSS.escape(uuid)}"]`)?.classList.add("selected");
+    }
+  }
   try {
     maybeShowFilterEmptyState(body);
   } catch {
@@ -4002,6 +4197,14 @@ var init_message_list = __esm({
       }
       onFlagClick(e) {
         e.stopPropagation();
+        const body = this.el.parentElement;
+        if (body?.classList.contains("multi-select-on") && this.el.classList.contains("selected")) {
+          const sel = selectedRows();
+          if (sel.length > 1) {
+            void bulkSetFlagged(sel, !this.el.classList.contains("flagged"));
+            return;
+          }
+        }
         const newFlaggedState = !this.el.classList.contains("flagged");
         const prevFlags = [...this.msg.flags || []];
         this.isFlagged = newFlaggedState;
@@ -4139,33 +4342,23 @@ var init_message_list = __esm({
         const accountId = this.accountId;
         const msg = this.msg;
         const self = this;
+        const selCount = getSelectedMessages().length;
+        const countSfx = selCount > 1 ? ` (${selCount})` : "";
+        const rowTargets = () => {
+          const s = selectedRows();
+          return s.length > 0 ? s : [self];
+        };
         const items = [
           {
-            label: isSeen ? "Mark unread" : "Mark read",
-            action: async () => {
-              const probe = { flags: [...msg.flags || []] };
-              setSeen(probe, !isSeen);
-              try {
-                await updateFlags(accountId, msg.uid, probe.flags);
-                msg.flags = probe.flags;
-                updateMessageFlags(accountId, msg.uid, probe.flags);
-                self.setUnreadClass(isSeen);
-              } catch {
-              }
-            }
+            // Target state = inverse of what the menu showed, matching what
+            // the user clicked. Visual-state-based labels stay coherent with
+            // the auto-mark-as-read debounce. Applies to the whole selection.
+            label: (isSeen ? "Mark unread" : "Mark read") + countSfx,
+            action: () => bulkSetSeen(rowTargets(), !isSeen)
           },
           {
-            label: isFlagged ? "Unflag" : "Flag",
-            action: async () => {
-              const probe = { flags: [...msg.flags || []] };
-              setFlagged(probe, !isFlagged);
-              try {
-                await updateFlags(accountId, msg.uid, probe.flags);
-                msg.flags = probe.flags;
-                self.setFlaggedClass(!isFlagged);
-              } catch {
-              }
-            }
+            label: (isFlagged ? "Unflag" : "Flag") + countSfx,
+            action: () => bulkSetFlagged(rowTargets(), !isFlagged)
           },
           { label: "", action: () => {
           }, separator: true },
@@ -4199,8 +4392,8 @@ var init_message_list = __esm({
           {
             label: "Move to folder\u2026",
             action: async () => {
-              const selectedRows = Array.from(document.querySelectorAll(".ml-row.selected"));
-              const uids = selectedRows.length > 0 ? selectedRows.map((r) => Number(r.dataset.uid)).filter((u) => !isNaN(u)) : [msg.uid];
+              const selectedRows2 = Array.from(document.querySelectorAll(".ml-row.selected"));
+              const uids = selectedRows2.length > 0 ? selectedRows2.map((r) => Number(r.dataset.uid)).filter((u) => !isNaN(u)) : [msg.uid];
               const pick = await pickFolder(accountId, { excludeFolderIds: [msg.folderId] });
               if (!pick)
                 return;
@@ -4582,7 +4775,7 @@ function overdueTaskRowHtml(t) {
   }
   return `<div class="cal-side-task cal-side-task-overdue" data-uuid="${escapeHtml4(t.uuid)}">
         <input type="checkbox" class="cal-side-overdue-check" title="Mark done">
-        <span class="cal-side-task-title">${escapeHtml4(t.title)}</span>
+        <span class="cal-side-task-title" title="${escapeHtml4(t.title)}">${escapeHtml4(t.title)}</span>
         <span class="cal-side-task-due overdue">${escapeHtml4(dueLabel)}</span>
     </div>`;
 }
@@ -4643,7 +4836,7 @@ function renderEvents(events) {
       html += `<div class="cal-side-event" data-id="${e.id}" data-link="${escapeHtml4(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">${escapeHtml4(e.title)}<span class="cal-side-event-recur" title="Daily">\u21BB</span></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>
             </div>`;
     }
   }
@@ -4669,14 +4862,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">${calIconHtml(info)} ${escapeHtml4(e.title)}</span>
+                <span class="cal-side-event-title cal-side-event-holiday-title" title="${escapeHtml4(e.title)}">${calIconHtml(info)} ${escapeHtml4(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}>
                 ${calIconHtml(info)}
                 <span class="cal-side-event-time">${escapeHtml4(formatTime(e))}</span>
-                <span class="cal-side-event-title">${escapeHtml4(e.title)}${recurMark}</span>
+                <span class="cal-side-event-title" title="${escapeHtml4(e.title)}">${escapeHtml4(e.title)}${recurMark}</span>
             </div>`;
     }
   }
@@ -4761,7 +4954,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" : ""}">${escapeHtml4(t.title)}</span>
+            <span class="cal-side-task-title${done ? " done" : ""}" title="${escapeHtml4(t.title)}">${escapeHtml4(t.title)}</span>
             ${dueHtml}
             <button class="cal-side-task-delete" title="Delete task" aria-label="Delete task">\xD7</button>
         </div>`;
@@ -5920,12 +6113,13 @@ decides which operators work.</p>
 <h3>Qualifiers \u2014 work in every mode</h3>
 <table>
   <tr><th>Form</th><th>Effect</th></tr>
-  <tr><td><code>from:bob</code></td><td>Sender contains</td></tr>
-  <tr><td><code>to:eleanor</code></td><td>Recipient contains</td></tr>
+  <tr><td><code>from:bob</code></td><td>Sender (name or address) contains</td></tr>
+  <tr><td><code>to:eleanor</code></td><td>Recipient contains \u2014 matches <strong>To <em>or</em> Cc</strong> (anyone the message was addressed to)</td></tr>
+  <tr><td><code>cc:dana</code></td><td>Cc only \u2014 when you want to exclude the main To line</td></tr>
   <tr><td><code>subject:lunch</code></td><td>Subject contains</td></tr>
   <tr><td><code>date:2026-05-01</code></td><td>On that date \u2014 also <code>date:&gt;1w</code>, <code>date:&lt;=2026-01-15</code></td></tr>
   <tr><td><code>after:1w</code> / <code>before:1m</code></td><td>Newer / older than \u2014 <code>d</code>, <code>w</code>, <code>m</code>, <code>y</code>, a date, <code>today</code>, <code>yesterday</code></td></tr>
-  <tr><td><code>has:attachment</code></td><td>Has an attachment</td></tr>
+  <tr><td><code>has:attachment</code></td><td>Only messages that carry a file attachment</td></tr>
   <tr><td><code>is:unread</code></td><td>Also <code>is:flagged</code>, <code>is:read</code>, <code>is:answered</code>, <code>is:draft</code></td></tr>
   <tr><td><code>folder:sent</code></td><td>Restrict to folders whose name contains the term</td></tr>
   <tr><td><code>/regex/</code></td><td>Client-side regex over the currently-visible rows. Local only \u2014 never sent to the server.</td></tr>
@@ -6252,6 +6446,22 @@ function renderNode(node, container, depth) {
   folderEl.dataset.folderPath = node.path;
   folderEl.dataset.specialUse = node.specialUse || "";
   folderEl.style.paddingLeft = `${depth * 16 + 8}px`;
+  if (node.id !== -1 && !node.specialUse) {
+    folderEl.draggable = true;
+    folderEl.addEventListener("dragstart", (e) => {
+      e.dataTransfer.effectAllowed = "move";
+      e.dataTransfer.setData("application/x-mailx-folder", JSON.stringify({
+        accountId: node.accountId,
+        folderId: node.id,
+        name: node.name,
+        path: node.path,
+        // Carry the real hierarchy delimiter so the descendant-drop
+        // guard doesn't have to guess it from the path (a top-level
+        // folder like "Work" has neither "/" nor "." to infer from).
+        delimiter: node.delimiter
+      }));
+    });
+  }
   const toggle = document.createElement("span");
   toggle.className = "ft-toggle";
   if (hasChildren) {
@@ -6479,6 +6689,48 @@ function renderNode(node, container, depth) {
         clearTimeout(dragExpandTimer);
         dragExpandTimer = null;
       }
+      const folderData = e.dataTransfer.getData("application/x-mailx-folder");
+      if (folderData) {
+        let src;
+        try {
+          src = JSON.parse(folderData);
+        } catch {
+          return;
+        }
+        const delim = src.delimiter || (node.path.includes("/") ? "/" : node.path.includes(".") ? "." : "/");
+        if (src.accountId !== node.accountId) {
+          const statusEl3 = document.getElementById("status-sync");
+          if (statusEl3)
+            statusEl3.textContent = "Folders can only be reparented within the same account.";
+          return;
+        }
+        if (src.folderId === node.id)
+          return;
+        if (node.path === src.path || node.path.startsWith(src.path + delim)) {
+          const statusEl3 = document.getElementById("status-sync");
+          if (statusEl3)
+            statusEl3.textContent = "Can't move a folder into one of its own subfolders.";
+          return;
+        }
+        if (!confirm(`Move folder "${src.name}" into "${node.name}"?`))
+          return;
+        const statusEl2 = document.getElementById("status-sync");
+        try {
+          await renameFolder(src.accountId, src.folderId, src.name, node.id);
+          if (statusEl2)
+            statusEl2.textContent = `Moved "${src.name}" into "${node.name}"`;
+          expandState[`${node.accountId}:${node.path}`] = true;
+          saveExpandState();
+          const treeContainer2 = document.getElementById("folder-tree");
+          if (treeContainer2)
+            loadFolderTree(treeContainer2);
+        } catch (err) {
+          if (statusEl2)
+            statusEl2.textContent = `Move failed: ${err?.message || err}`;
+          alert(`Failed: ${err?.message || err}`);
+        }
+        return;
+      }
       const multiData = e.dataTransfer.getData("application/x-mailx-messages");
       const singleData = e.dataTransfer.getData("application/x-mailx-message");
       const messages2 = multiData ? JSON.parse(multiData) : singleData ? [JSON.parse(singleData)] : [];
@@ -7143,6 +7395,21 @@ init_message_viewer();
 init_api_client();
 init_message_state();
 installConsoleCapture();
+(function installStallWatchdog() {
+  const EXPECTED_MS = 1e3;
+  const STALL_MS = 250;
+  let last = performance.now();
+  const tick = () => {
+    const now = performance.now();
+    const slip = now - last - EXPECTED_MS;
+    if (slip > STALL_MS) {
+      console.warn(`  [stall] main thread blocked ~${slip.toFixed(0)}ms (event loop frozen \u2014 UI was unresponsive this long)`);
+    }
+    last = now;
+    setTimeout(tick, EXPECTED_MS);
+  };
+  setTimeout(tick, EXPECTED_MS);
+})();
 var APP_NAME = "rmfmail";
 function propagateAppName() {
   const set = (id, fn) => {
@@ -7727,6 +7994,11 @@ document.getElementById("btn-factory-reset")?.addEventListener("click", async ()
 });
 async function openCompose(mode, overrideMsg, overrideAccountId) {
   logClientEvent("openCompose-entry", { mode });
+  for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
+    const dd = document.getElementById(id);
+    if (dd && !dd.hidden) hideDropdownHard(dd);
+  }
+  refreshToolbarOverlayShield();
   const current = overrideMsg ? { message: overrideMsg, accountId: overrideAccountId || currentAccountId3 } : getCurrentMessage();
   if ((mode === "reply" || mode === "replyAll" || mode === "forward" || mode === "editAsNew") && !current) {
     console.warn(`[compose] ${mode} \u2014 no message selected`);
@@ -7738,7 +8010,7 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
   const titleSubject = mode === "new" ? "" : msg?.subject || "";
   const frame = showComposeOverlay(titleSubject ? `${titlePrefix}: ${titleSubject}` : titlePrefix);
   const accounts = await accountsP;
-  const accountId = current?.accountId || accounts[0]?.id || "";
+  const accountId = mode === "new" ? currentAccountId3 || current?.accountId || accounts[0]?.id || "" : current?.accountId || currentAccountId3 || accounts[0]?.id || "";
   const rePrefix = /^(re|fwd?):\s*/i;
   const cleanSubject = msg ? msg.subject.replace(rePrefix, "") : "";
   const init = {
@@ -7848,6 +8120,25 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
     init.subject = msg.subject || "";
     init.bodyHtml = editAsNewBody(msg);
   }
+  if (msg && (mode === "editAsNew" || mode === "forward") && Array.isArray(msg.attachments) && msg.attachments.length) {
+    const msgAccountId = current?.accountId || accountId;
+    const loaded = [];
+    for (const att of msg.attachments) {
+      try {
+        const data = await getAttachment(msgAccountId, msg.uid, att.id, msg.folderId);
+        if (data?.content) {
+          loaded.push({
+            filename: data.filename || att.filename || "attachment",
+            mimeType: data.contentType || att.contentType || "application/octet-stream",
+            dataBase64: data.content
+          });
+        }
+      } catch (e) {
+        console.error(`[compose] ${mode}: failed to load attachment ${att.id}: ${e?.message || e}`);
+      }
+    }
+    if (loaded.length) init.attachments = loaded;
+  }
   const initJson = JSON.stringify(init);
   try {
     sessionStorage.setItem("composeInit", initJson);
@@ -8214,6 +8505,12 @@ async function performUndo() {
 document.addEventListener("mailx-moved", (e) => {
   pushUndo({ kind: "move", at: Date.now(), payload: e.detail });
 });
+document.addEventListener("mailx-flagged-batch", (e) => {
+  const payload = e.detail;
+  if (Array.isArray(payload) && payload.length) {
+    pushUndo({ kind: "flag", at: Date.now(), payload });
+  }
+});
 (() => {
   const SLOP = 6;
   let cand = null;
@@ -8486,6 +8783,11 @@ document.getElementById("btn-spam-report")?.addEventListener("click", async () =
   }
 });
 document.getElementById("btn-compose")?.addEventListener("click", () => openCompose("new"));
+document.getElementById("btn-selection")?.addEventListener("click", (e) => {
+  e.stopPropagation();
+  const r = e.currentTarget.getBoundingClientRect();
+  void showSelectionMenu(r.left, r.bottom + 2);
+});
 document.getElementById("btn-mark-unread")?.addEventListener("click", () => {
   const sel = getCurrentFocused();
   if (!sel) return;
@@ -8841,6 +9143,20 @@ var currentAccountId3 = "";
 var currentFolderId2 = 0;
 var reloadDebounceTimer = null;
 var lastListReloadAt = 0;
+function closeSearchAndReveal() {
+  const focused = getCurrentFocused();
+  clearSearchMode();
+  const body = document.getElementById("ml-body");
+  if (body) body.querySelectorAll(".filter-hidden").forEach((r) => r.classList.remove("filter-hidden"));
+  if (focused && focused.folderId) {
+    currentAccountId3 = focused.accountId;
+    currentFolderId2 = focused.folderId;
+    revealMessage(focused.accountId, focused.folderId, focused.uid);
+  } else {
+    reloadCurrentFolder();
+  }
+  setTitle(APP_NAME);
+}
 searchInput?.addEventListener("input", () => {
   clearTimeout(searchTimeout);
   if (serverSearchTimer) {
@@ -8850,11 +9166,7 @@ searchInput?.addEventListener("input", () => {
   }
   updateSearchHighlight();
   if (searchInput.value.trim() === "") {
-    clearSearchMode();
-    const body = document.getElementById("ml-body");
-    if (body) body.querySelectorAll(".filter-hidden").forEach((r) => r.classList.remove("filter-hidden"));
-    reloadCurrentFolder();
-    setTitle(APP_NAME);
+    closeSearchAndReveal();
   } else {
     searchTimeout = setTimeout(() => doSearch(false), 180);
   }
@@ -8872,11 +9184,7 @@ searchInput?.addEventListener("keydown", (e) => {
     }
     cancelServerSearch();
     updateSearchHighlight();
-    clearSearchMode();
-    const body = document.getElementById("ml-body");
-    if (body) body.querySelectorAll(".filter-hidden").forEach((r) => r.classList.remove("filter-hidden"));
-    reloadCurrentFolder();
-    setTitle(APP_NAME);
+    closeSearchAndReveal();
   }
 });
 function rerunActiveSearch() {
@@ -9891,6 +10199,7 @@ var viewDropdown = document.getElementById("view-dropdown");
 var optTwoLine = document.getElementById("opt-two-line");
 var optPreview = document.getElementById("opt-preview");
 var optSnippet = document.getElementById("opt-snippet");
+var optFlagStars = document.getElementById("opt-flag-stars");
 var optThreaded = document.getElementById("opt-threaded");
 var optFlagged = document.getElementById("opt-flagged");
 var optFolderCounts = document.getElementById("opt-folder-counts");
@@ -9925,6 +10234,13 @@ function hideDropdownHard(dd) {
   dd.hidden = true;
   dd.style.cssText = "";
 }
+var tbEscapeCleanup = null;
+function closeToolbarDropdowns() {
+  for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
+    const dd = document.getElementById(id);
+    if (dd && !dd.hidden) hideDropdownHard(dd);
+  }
+}
 function refreshToolbarOverlayShield() {
   const dropdownOpen = ["settings-dropdown", "view-dropdown", "restart-dropdown"].some((id) => {
     const el = document.getElementById(id);
@@ -9940,16 +10256,46 @@ function refreshToolbarOverlayShield() {
       shield.addEventListener("pointerdown", (ev) => {
         ev.preventDefault();
         ev.stopPropagation();
-        for (const id of ["settings-dropdown", "view-dropdown", "restart-dropdown"]) {
-          const dd = document.getElementById(id);
-          if (dd) dd.hidden = true;
-        }
-        shield?.remove();
+        closeToolbarDropdowns();
+        refreshToolbarOverlayShield();
       });
       document.body.appendChild(shield);
     }
-  } else if (shield) {
-    shield.remove();
+    if (!tbEscapeCleanup) {
+      const docs = [];
+      document.querySelectorAll(".compose-overlay iframe, .popout-overlay iframe").forEach((ifr) => {
+        try {
+          if (ifr.contentDocument) docs.push(ifr.contentDocument);
+        } catch {
+        }
+      });
+      if (docs.length) {
+        const onEsc = (e) => {
+          if (e.key !== "Escape") return;
+          if (!["settings-dropdown", "view-dropdown", "restart-dropdown"].some((id) => {
+            const el = document.getElementById(id);
+            return el && !el.hidden;
+          })) return;
+          e.preventDefault();
+          e.stopPropagation();
+          closeToolbarDropdowns();
+          refreshToolbarOverlayShield();
+        };
+        for (const d of docs) d.addEventListener("keydown", onEsc, true);
+        tbEscapeCleanup = () => {
+          for (const d of docs) {
+            try {
+              d.removeEventListener("keydown", onEsc, true);
+            } catch {
+            }
+          }
+          tbEscapeCleanup = null;
+        };
+      }
+    }
+  } else {
+    if (shield) shield.remove();
+    if (tbEscapeCleanup) tbEscapeCleanup();
   }
 }
 document.addEventListener("keydown", (e) => {
@@ -9980,18 +10326,21 @@ document.addEventListener("keydown", (e) => {
 var savedTwoLine = localStorage.getItem("mailx-two-line") === "true";
 var savedPreview = localStorage.getItem("mailx-preview") !== "false";
 var savedSnippet = localStorage.getItem("mailx-snippet") !== "false";
+var savedFlagStars = localStorage.getItem("mailx-flag-stars") !== "false";
 var savedThreaded = localStorage.getItem("mailx-threaded") === "true";
 var savedFlagged = localStorage.getItem("mailx-flagged") === "true";
 var savedFolderCounts = localStorage.getItem("mailx-folder-counts") === "true";
 if (optTwoLine) optTwoLine.checked = savedTwoLine;
 if (optPreview) optPreview.checked = savedPreview;
 if (optSnippet) optSnippet.checked = savedSnippet;
+if (optFlagStars) optFlagStars.checked = savedFlagStars;
 if (optThreaded) optThreaded.checked = savedThreaded;
 if (optFlagged) optFlagged.checked = savedFlagged;
 if (optFolderCounts) optFolderCounts.checked = savedFolderCounts;
 if (savedTwoLine) document.getElementById("message-list")?.classList.add("two-line");
 if (!savedPreview) document.querySelector(".main-area")?.classList.add("no-preview");
 if (!savedSnippet) document.getElementById("message-list")?.classList.add("no-snippets");
+if (!savedFlagStars) document.getElementById("message-list")?.classList.add("no-empty-stars");
 if (savedThreaded) document.getElementById("ml-body")?.classList.add("threaded");
 if (savedFlagged) {
   document.getElementById("ml-body")?.classList.add("flagged-only");
@@ -10161,6 +10510,11 @@ optSnippet?.addEventListener("change", () => {
   }
   localStorage.setItem("mailx-snippet", String(optSnippet.checked));
 });
+optFlagStars?.addEventListener("change", () => {
+  const list = document.getElementById("message-list");
+  list?.classList.toggle("no-empty-stars", !optFlagStars.checked);
+  localStorage.setItem("mailx-flag-stars", String(optFlagStars.checked));
+});
 document.getElementById("search-help")?.addEventListener("click", async () => {
   const btn = document.getElementById("search-help");
   if (!btn) return;