@bobfrankston/rmfmail 1.2.192 → 1.2.194

package/client/app.ts

@@ -1755,6 +1755,16 @@ async function performUndo(): Promise<void> {
             if (statusSync) statusSync.textContent = msgs.length === 1
                 ? "Message restored"
                 : `Restored ${msgs.length} messages`;
+            // Position at what was just restored — an undo whose effect lands
+            // off-screen (or in a folder you've since left) reads as a no-op.
+            // Reveal the first of the batch; the rest are in the same view.
+            // On a miss revealMessage restores the prior view itself.
+            const first = msgs[0];
+            if (first?.folderId) {
+                await revealMessage(first.accountId, first.folderId, first.uid);
+                syncChromeToListView();
+                return;
+            }
         } else if (op.kind === "move") {
             const { messages } = op.payload;
             const byDest = new Map<string, { accountId: string; folderId: number; uids: number[] }>();
@@ -1769,6 +1779,14 @@ async function performUndo(): Promise<void> {
                 else await moveMessages(group.accountId, group.uids, group.folderId);
             }
             if (statusSync) statusSync.textContent = `Undid move of ${messages.length} message${messages.length !== 1 ? "s" : ""}`;
+            // Same positioning rule as undo-delete: show the message back in
+            // its original folder.
+            const firstMoved = messages[0];
+            if (firstMoved?.sourceFolderId) {
+                await revealMessage(firstMoved.accountId, firstMoved.sourceFolderId, firstMoved.uid);
+                syncChromeToListView();
+                return;
+            }
         } else if (op.kind === "flag") {
             const { updateFlags } = await import("./lib/api-client.js");
             // Restore each row's prior \Flagged state. Mutates message-state
@@ -2644,6 +2662,14 @@ async function closeSearchAndReveal(): Promise<void> {
     // claimed search-on-All-Inboxes and the list looked broken (Bob
     // 2026-07-04 "cleared the search but it isn't restoring the list").
     // Sync tab, tree highlight and titles to what the list actually shows.
+    syncChromeToListView();
+}
+
+/** Mirror tab, folder-tree highlight and titles to whatever view the message
+ *  list is actually showing. Needed after any list-driven navigation
+ *  (revealMessage from search-close or undo) — the list module can land on a
+ *  different folder than the surrounding chrome still claims. */
+function syncChromeToListView(): void {
     const vw = getCurrentView();
     if (vw.unified) {
         highlightFolder(null, -1);

package/client/compose/compose.bundle.js

@@ -6150,8 +6150,9 @@ document.getElementById("btn-edit-in-word")?.addEventListener("click", async ()
       return;
     }
     const label = result.opener === "word" ? "Word" : result.opener === "libreoffice" ? "LibreOffice" : "your default editor";
-    showDraftStatus(`Editing in ${label} \u2014 saves there will reload here.`, false);
-    showExternalEditHint(label);
+    const isDocx = /\.docx$/i.test(result.path || "");
+    showDraftStatus(`Editing in ${label} \u2014 Ctrl+S there and the message updates here automatically.`, false);
+    if (!isDocx) showExternalEditHint(label);
   } catch (e) {
     showDraftStatus(`Edit-in-Word failed: ${e?.message || e}`, true);
   }
@@ -6257,7 +6258,7 @@ function showExternalEditHint(editorLabel) {
         <div style="font-weight:600;font-size:16px;margin-bottom:10px;">Editing in ${escapeHtml(editorLabel)}</div>
         <ol style="margin:0 0 12px 18px;padding:0;">
             <li>Edit your message in <b>${escapeHtml(editorLabel)}</b>.</li>
-            <li>Save (<b>Ctrl+S</b>). Today, choose <b>"Web Page, Filtered (.htm)"</b> if Word asks for a format \u2014 keep the same filename.</li>
+            <li>Save (<b>Ctrl+S</b>). Choose <b>"Web Page, Filtered (.htm)"</b> if asked for a format \u2014 keep the same filename.</li>
             <li>Switch back to this window (<b>Alt+Tab</b>). The body will reload here.</li>
             <li>Click <b>Send</b> in this window when ready.</li>
         </ol>