@bobfrankston/rmfmail 1.2.102 → 1.2.105

package/bin/mailx.ts

@@ -1918,12 +1918,28 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
     void syncWorkerHandle;
     // Native client is the only option (iflow-direct)
     const svc = new MailxService(store, imapManager);
-    // Loopback popout-window server (lets the client window.open a message into
-    // its own OS window). Ephemeral port + per-launch token; best-effort.
+    // Loopback popout-window server (renders a single message for its own OS
+    // window). Ephemeral port + per-launch token; best-effort. Toolbar actions
+    // from popout windows are forwarded to the main window as `popoutAction`
+    // events (app.ts opens the editable compose there — the popout page has no
+    // IPC bridge so it can't host compose itself). `sendToClient` is late-bound:
+    // the ServiceHandle doesn't exist yet at this point in startup.
     let popoutInfo: { port: number; token: string } | null = null;
+    let sendToClient: ((msg: any) => void) | null = null;
+    const popoutWindows = new Map<string, ReturnType<typeof showMessageBoxEx>>();
+    const popoutKey = (a: string, f: number | undefined, u: number): string => `${a}|${f ?? ""}|${u}`;
     try {
         const { startPopoutServer } = await import("./popout-server.js");
-        popoutInfo = await startPopoutServer(svc);
+        popoutInfo = await startPopoutServer(svc, (act) => {
+            console.log(`  [popout] action ${act.action} a=${act.accountId} u=${act.uid} f=${act.folderId ?? ""}`);
+            sendToClient?.({ _event: "popoutAction", type: "popoutAction", ...act });
+            if (act.action === "delete") {
+                // The message is gone — close its window (browser-opened
+                // fallback windows close themselves client-side).
+                const h = popoutWindows.get(popoutKey(act.accountId, act.folderId, act.uid));
+                if (h && !h.closed) { try { h.close(); } catch { /* already gone */ } }
+            }
+        });
     } catch (e: any) {
         console.error(`  [popout] disabled: ${e?.message || e}`);
     }
@@ -2029,6 +2045,36 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
     // the same way the `mailx` CLI does.
     const __mailxJs = path.join(import.meta.dirname, "mailx.js");
     const __relaunchCommand = `"${process.execPath}" "${__mailxJs}"`;
+    // "Open in separate window" (🗗) spawns a NATIVE msger WebView window
+    // pointed at the loopback popout server — not the OS browser (Bob
+    // 2026-07-06). Injected here (not in mailx-service) because it needs
+    // mailx-host + the icon paths. One window per message: a second request
+    // for the same message is a no-op while its window is open. Child PIDs
+    // are tracked in instance.json so `rmfmail -kill` reaps popouts too.
+    if (popoutInfo) {
+        const pi = popoutInfo;
+        svc.setPopoutWindowFn(async ({ accountId, uid, folderId, subject }) => {
+            const key = popoutKey(accountId, folderId, uid);
+            const existing = popoutWindows.get(key);
+            if (existing && !existing.closed) return { ok: true };
+            const url = `http://127.0.0.1:${pi.port}/v?a=${encodeURIComponent(accountId)}&u=${uid}&f=${folderId ?? ""}&t=${encodeURIComponent(pi.token)}`;
+            const h = showMessageBoxEx({
+                title: subject || "Message",
+                url,
+                size: { width: 820, height: 900 },
+                icon: __iconPathRuntime,
+                aumid: "com.frankston.rmfmail",
+                escapeCloses: true,
+            });
+            popoutWindows.set(key, h);
+            if (typeof h.pid === "number") addChildPid(h.pid);
+            void h.result.catch(() => { /* window died — cleanup below */ }).finally(() => {
+                popoutWindows.delete(key);
+                if (typeof h.pid === "number") removeChildPid(h.pid);
+            });
+            return { ok: true };
+        });
+    }
     _tick("calling showService (WebView opens here)");
     const handle = showService({
         title: `rmfmail v${rootPkgVersion}`,
@@ -2048,6 +2094,9 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
             : undefined,
         escapeCloses: false,
     });
+    // Late-bind the popout-action forwarder now that the main window's
+    // service channel exists.
+    sendToClient = (m: any) => handle.send(m);
 
     // Register ourselves as the live instance so subsequent `rmfmail`
     // invocations can detect version-mismatch and upgrade us (see top of

package/bin/popout-server.js

@@ -1,9 +1,10 @@
 /**
  * Popout server — a tiny loopback HTTP server that renders a single message in
- * its own OS window (`window.open` from the client points a real browser window
- * at it). msger's custom protocol doesn't propagate to child windows, so a
- * separate window can't use the normal IPC client; this serves a self-contained
- * read view instead.
+ * its own OS window. The daemon points a native msger WebView window at it
+ * (svc.popoutWindow → showMessageBoxEx({url}) in bin/mailx.ts); a plain browser
+ * can load the same URL, which is the future "browser option". msger's custom
+ * protocol doesn't propagate to child windows, so a separate window can't use
+ * the normal IPC client; this serves a self-contained view instead.
  *
  * Transport choice (Bob 2026-06-29): loopback TCP on an OS-assigned EPHEMERAL
  * port (`listen(0)`) — no hardcoded port to collide, identical on every
@@ -12,14 +13,20 @@
  * reachable by any local process, so every route is gated on a per-launch random
  * token. Future: the `msgapi` channel could serve this without HTTP at all.
  *
- * Cut 1 = read + links (links POST back here → svc.openExternal → OS browser).
- * Toolbar actions (reply/forward/delete/flag) are a follow-up.
+ * Toolbar actions (Bob 2026-07-06 "when I want to do the reply I need it to be
+ * editable"): the popout page can't host compose (no IPC bridge, no Quill), so
+ * Reply / Reply All / Forward / Edit-as-new / Flag / Delete POST back to
+ * /action, which hands them to `onAction` — bin/mailx.ts forwards that as a
+ * `popoutAction` event to the MAIN window, where app.ts opens the real,
+ * editable compose overlay (same path as the in-window popout's toolbar).
  */
 import http from "node:http";
 import crypto from "node:crypto";
 /** svc must expose getMessage(accountId, uid, allowRemote, folderId) and
- *  openExternal(url). Returns null if the server can't bind (popout disabled). */
-export async function startPopoutServer(svc) {
+ *  openExternal(url). `onAction` receives toolbar actions from popout windows
+ *  (reply/replyAll/forward/editAsNew/flag/delete) for routing to the main
+ *  window. Returns null if the server can't bind (popout disabled). */
+export async function startPopoutServer(svc, onAction) {
     const token = crypto.randomBytes(18).toString("hex");
     const server = http.createServer(async (req, res) => {
         try {
@@ -60,6 +67,25 @@ export async function startPopoutServer(svc) {
                 res.writeHead(204).end();
                 return;
             }
+            if (req.method === "POST" && url.pathname === "/action") {
+                let body = "";
+                for await (const chunk of req)
+                    body += chunk;
+                let action = "";
+                try {
+                    action = (JSON.parse(body || "{}").action) || "";
+                }
+                catch { /* */ }
+                const known = ["reply", "replyAll", "forward", "editAsNew", "flag", "delete"];
+                if (action && known.includes(action) && onAction) {
+                    onAction({ action, accountId: a, uid: u, folderId: f });
+                    res.writeHead(204).end();
+                }
+                else {
+                    res.writeHead(400).end("unknown action");
+                }
+                return;
+            }
             res.writeHead(404).end("not found");
         }
         catch (e) {
@@ -95,35 +121,71 @@ function addrLine(list) {
         return "";
     return list.map((x) => esc(x?.name ? `${x.name} <${x.address}>` : (x?.address || ""))).filter(Boolean).join(", ");
 }
-/** The outer popout page: header + sandboxed body iframe. A small script relays
- *  the iframe's link clicks back to /open so they land in the OS browser. */
+/** The outer popout page: header + action toolbar + sandboxed body iframe.
+ *  Toolbar buttons POST to /action (→ daemon → main window opens editable
+ *  compose / flags / deletes). A small script relays the iframe's link clicks
+ *  back to /open so they land in the OS browser. */
 function renderPage(msg, a, u, f, token) {
     const subject = esc(msg?.subject || "(no subject)");
     const from = esc(msg?.from?.name ? `${msg.from.name} <${msg.from.address}>` : (msg?.from?.address || ""));
     const to = addrLine(msg?.to);
     const date = msg?.date ? esc(new Date(msg.date).toLocaleString()) : "";
     const q = `a=${encodeURIComponent(a)}&u=${u}&f=${f ?? ""}&t=${encodeURIComponent(token)}`;
+    // Same glyph set as the in-window popout toolbar (message-viewer.ts) so
+    // the two surfaces read as the same feature.
+    const btn = (action, glyph, title) => `<button class="act" data-action="${action}" title="${esc(title)}">${glyph}</button>`;
     return `<!doctype html><html><head><meta charset="utf-8"><title>${subject}</title>
 <style>
   html,body{margin:0;height:100%;font-family:system-ui,Segoe UI,sans-serif;color:#111;background:#fff;}
   body{display:flex;flex-direction:column;}
-  .hdr{padding:10px 14px;border-bottom:1px solid #ddd;flex:0 0 auto;}
+  .hdr{padding:10px 14px 6px;border-bottom:1px solid #ddd;flex:0 0 auto;}
   .subj{font-size:1.15em;font-weight:600;margin-bottom:4px;}
   .meta{font-size:0.85em;color:#555;line-height:1.4;}
+  .bar{display:flex;gap:6px;padding:6px 14px 8px;align-items:center;}
+  .act{font-size:1em;line-height:1;padding:5px 10px;border:1px solid #ccc;border-radius:4px;background:#f6f6f6;cursor:pointer;}
+  .act:hover{background:#e9e9e9;}
+  .note{font-size:0.78em;color:#888;margin-left:auto;}
   iframe{flex:1 1 auto;border:none;width:100%;}
 </style></head><body>
   <div class="hdr">
     <div class="subj">${subject}</div>
     <div class="meta">${from ? "From: " + from + "<br>" : ""}${to ? "To: " + to + "<br>" : ""}${date}</div>
+    <div class="bar">
+      ${btn("reply", "↩", "Reply")}
+      ${btn("replyAll", "↩↩", "Reply All")}
+      ${btn("forward", "→", "Forward")}
+      ${btn("editAsNew", "⧉", "Edit as new message")}
+      ${btn("flag", "★", "Flag")}
+      ${btn("delete", "🗑", "Delete")}
+      <span class="note" id="note"></span>
+    </div>
   </div>
   <iframe src="/body?${q}" sandbox="allow-scripts allow-same-origin"></iframe>
   <script>
     var T=${JSON.stringify(token)};
+    var Q=${JSON.stringify(q)};
     window.addEventListener("message", function(e){
       if(e.data && e.data.type==="popout-link" && e.data.url){
         fetch("/open?t="+encodeURIComponent(T),{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify({url:e.data.url})});
       }
     });
+    document.querySelectorAll(".act").forEach(function(b){
+      b.addEventListener("click", function(){
+        var action=b.getAttribute("data-action");
+        fetch("/action?"+Q,{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify({action:action})})
+          .then(function(r){
+            if(!r.ok){document.getElementById("note").textContent="action failed";return;}
+            if(action==="reply"||action==="replyAll"||action==="forward"||action==="editAsNew"){
+              document.getElementById("note").textContent="compose opened in main window";
+            }else if(action==="delete"){
+              // Daemon closes the msger window; browser-opened windows can
+              // close themselves (script-opened → close() allowed).
+              try{window.close();}catch(_){}
+            }
+          })
+          .catch(function(){document.getElementById("note").textContent="action failed";});
+      });
+    });
   </script>
 </body></html>`;
 }

package/bin/popout-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"popout-server.js","sourceRoot":"","sources":["popout-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"popout-server.js","sourceRoot":"","sources":["popout-server.ts"],"names":[],"mappings":"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"}

package/bin/popout-server.ts

@@ -1,9 +1,10 @@
 /**
  * Popout server — a tiny loopback HTTP server that renders a single message in
- * its own OS window (`window.open` from the client points a real browser window
- * at it). msger's custom protocol doesn't propagate to child windows, so a
- * separate window can't use the normal IPC client; this serves a self-contained
- * read view instead.
+ * its own OS window. The daemon points a native msger WebView window at it
+ * (svc.popoutWindow → showMessageBoxEx({url}) in bin/mailx.ts); a plain browser
+ * can load the same URL, which is the future "browser option". msger's custom
+ * protocol doesn't propagate to child windows, so a separate window can't use
+ * the normal IPC client; this serves a self-contained view instead.
  *
  * Transport choice (Bob 2026-06-29): loopback TCP on an OS-assigned EPHEMERAL
  * port (`listen(0)`) — no hardcoded port to collide, identical on every
@@ -12,8 +13,12 @@
  * reachable by any local process, so every route is gated on a per-launch random
  * token. Future: the `msgapi` channel could serve this without HTTP at all.
  *
- * Cut 1 = read + links (links POST back here → svc.openExternal → OS browser).
- * Toolbar actions (reply/forward/delete/flag) are a follow-up.
+ * Toolbar actions (Bob 2026-07-06 "when I want to do the reply I need it to be
+ * editable"): the popout page can't host compose (no IPC bridge, no Quill), so
+ * Reply / Reply All / Forward / Edit-as-new / Flag / Delete POST back to
+ * /action, which hands them to `onAction` — bin/mailx.ts forwards that as a
+ * `popoutAction` event to the MAIN window, where app.ts opens the real,
+ * editable compose overlay (same path as the in-window popout's toolbar).
  */
 import http from "node:http";
 import crypto from "node:crypto";
@@ -23,9 +28,18 @@ export interface PopoutServerInfo {
     token: string;
 }
 
+export interface PopoutAction {
+    action: string;
+    accountId: string;
+    uid: number;
+    folderId?: number;
+}
+
 /** svc must expose getMessage(accountId, uid, allowRemote, folderId) and
- *  openExternal(url). Returns null if the server can't bind (popout disabled). */
-export async function startPopoutServer(svc: any): Promise<PopoutServerInfo | null> {
+ *  openExternal(url). `onAction` receives toolbar actions from popout windows
+ *  (reply/replyAll/forward/editAsNew/flag/delete) for routing to the main
+ *  window. Returns null if the server can't bind (popout disabled). */
+export async function startPopoutServer(svc: any, onAction?: (act: PopoutAction) => void): Promise<PopoutServerInfo | null> {
     const token = crypto.randomBytes(18).toString("hex");
 
     const server = http.createServer(async (req, res) => {
@@ -64,6 +78,20 @@ export async function startPopoutServer(svc: any): Promise<PopoutServerInfo | nu
                 res.writeHead(204).end();
                 return;
             }
+            if (req.method === "POST" && url.pathname === "/action") {
+                let body = "";
+                for await (const chunk of req) body += chunk;
+                let action = "";
+                try { action = (JSON.parse(body || "{}").action) || ""; } catch { /* */ }
+                const known = ["reply", "replyAll", "forward", "editAsNew", "flag", "delete"];
+                if (action && known.includes(action) && onAction) {
+                    onAction({ action, accountId: a, uid: u, folderId: f });
+                    res.writeHead(204).end();
+                } else {
+                    res.writeHead(400).end("unknown action");
+                }
+                return;
+            }
             res.writeHead(404).end("not found");
         } catch (e: any) {
             try { res.writeHead(500).end(String(e?.message || e)); } catch { /* */ }
@@ -97,35 +125,72 @@ function addrLine(list: any): string {
     return list.map((x: any) => esc(x?.name ? `${x.name} <${x.address}>` : (x?.address || ""))).filter(Boolean).join(", ");
 }
 
-/** The outer popout page: header + sandboxed body iframe. A small script relays
- *  the iframe's link clicks back to /open so they land in the OS browser. */
+/** The outer popout page: header + action toolbar + sandboxed body iframe.
+ *  Toolbar buttons POST to /action (→ daemon → main window opens editable
+ *  compose / flags / deletes). A small script relays the iframe's link clicks
+ *  back to /open so they land in the OS browser. */
 function renderPage(msg: any, a: string, u: number, f: number | undefined, token: string): string {
     const subject = esc(msg?.subject || "(no subject)");
     const from = esc(msg?.from?.name ? `${msg.from.name} <${msg.from.address}>` : (msg?.from?.address || ""));
     const to = addrLine(msg?.to);
     const date = msg?.date ? esc(new Date(msg.date).toLocaleString()) : "";
     const q = `a=${encodeURIComponent(a)}&u=${u}&f=${f ?? ""}&t=${encodeURIComponent(token)}`;
+    // Same glyph set as the in-window popout toolbar (message-viewer.ts) so
+    // the two surfaces read as the same feature.
+    const btn = (action: string, glyph: string, title: string): string =>
+        `<button class="act" data-action="${action}" title="${esc(title)}">${glyph}</button>`;
     return `<!doctype html><html><head><meta charset="utf-8"><title>${subject}</title>
 <style>
   html,body{margin:0;height:100%;font-family:system-ui,Segoe UI,sans-serif;color:#111;background:#fff;}
   body{display:flex;flex-direction:column;}
-  .hdr{padding:10px 14px;border-bottom:1px solid #ddd;flex:0 0 auto;}
+  .hdr{padding:10px 14px 6px;border-bottom:1px solid #ddd;flex:0 0 auto;}
   .subj{font-size:1.15em;font-weight:600;margin-bottom:4px;}
   .meta{font-size:0.85em;color:#555;line-height:1.4;}
+  .bar{display:flex;gap:6px;padding:6px 14px 8px;align-items:center;}
+  .act{font-size:1em;line-height:1;padding:5px 10px;border:1px solid #ccc;border-radius:4px;background:#f6f6f6;cursor:pointer;}
+  .act:hover{background:#e9e9e9;}
+  .note{font-size:0.78em;color:#888;margin-left:auto;}
   iframe{flex:1 1 auto;border:none;width:100%;}
 </style></head><body>
   <div class="hdr">
     <div class="subj">${subject}</div>
     <div class="meta">${from ? "From: " + from + "<br>" : ""}${to ? "To: " + to + "<br>" : ""}${date}</div>
+    <div class="bar">
+      ${btn("reply", "↩", "Reply")}
+      ${btn("replyAll", "↩↩", "Reply All")}
+      ${btn("forward", "→", "Forward")}
+      ${btn("editAsNew", "⧉", "Edit as new message")}
+      ${btn("flag", "★", "Flag")}
+      ${btn("delete", "🗑", "Delete")}
+      <span class="note" id="note"></span>
+    </div>
   </div>
   <iframe src="/body?${q}" sandbox="allow-scripts allow-same-origin"></iframe>
   <script>
     var T=${JSON.stringify(token)};
+    var Q=${JSON.stringify(q)};
     window.addEventListener("message", function(e){
       if(e.data && e.data.type==="popout-link" && e.data.url){
         fetch("/open?t="+encodeURIComponent(T),{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify({url:e.data.url})});
       }
     });
+    document.querySelectorAll(".act").forEach(function(b){
+      b.addEventListener("click", function(){
+        var action=b.getAttribute("data-action");
+        fetch("/action?"+Q,{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify({action:action})})
+          .then(function(r){
+            if(!r.ok){document.getElementById("note").textContent="action failed";return;}
+            if(action==="reply"||action==="replyAll"||action==="forward"||action==="editAsNew"){
+              document.getElementById("note").textContent="compose opened in main window";
+            }else if(action==="delete"){
+              // Daemon closes the msger window; browser-opened windows can
+              // close themselves (script-opened → close() allowed).
+              try{window.close();}catch(_){}
+            }
+          })
+          .catch(function(){document.getElementById("note").textContent="action failed";});
+      });
+    });
   </script>
 </body></html>`;
 }

package/client/app.bundle.js

@@ -85,6 +85,7 @@ __export(api_client_exports, {
   openInTextEditor: () => openInTextEditor,
   openInWord: () => openInWord,
   openLocalPath: () => openLocalPath,
+  popoutWindow: () => popoutWindow,
   readConfigHelp: () => readConfigHelp,
   readJsoncFile: () => readJsoncFile,
   reauthGoogleScopes: () => reauthGoogleScopes,
@@ -621,6 +622,12 @@ async function openAttachment(accountId, uid, attachmentId, folderId, filename)
 async function getMessageSource(accountId, uid, folderId) {
   return ipc().getMessageSource(accountId, uid, folderId);
 }
+async function popoutWindow(accountId, uid, folderId, subject) {
+  const fn = ipc().popoutWindow;
+  if (!fn)
+    return { ok: false, reason: "no popoutWindow bridge" };
+  return fn(accountId, uid, folderId, subject);
+}
 async function getDeviceAccounts() {
   return ipc().getDeviceAccounts?.() ?? [];
 }
@@ -2683,38 +2690,23 @@ function popOutCurrentMessage() {
 function popOutToWindow() {
   if (!currentMessage)
     return;
-  const p = window.__rmfPopout;
-  if (!p?.base || !p?.token) {
-    console.log("[popout-window] no server info (__rmfPopout missing) \u2192 overlay fallback");
-    popOutCurrentMessage();
-    return;
-  }
   const a = currentAccountId;
   const u = currentMessage.uid;
   const f = currentMessage.folderId;
-  const url = `${p.base}/v?a=${encodeURIComponent(a)}&u=${u}&f=${f ?? ""}&t=${encodeURIComponent(p.token)}`;
-  console.log(`[popout-window] opening ${url}`);
-  let w = null;
-  try {
-    w = window.open(url, `rmfmsg-${a}-${u}`, "width=820,height=900,resizable=yes,scrollbars=yes");
-  } catch (e) {
-    console.log(`[popout-window] window.open THREW: ${e?.message || e} \u2192 overlay fallback`);
-    popOutCurrentMessage();
-    return;
-  }
-  if (!w) {
-    console.log("[popout-window] window.open returned NULL (host blocked it) \u2192 overlay fallback");
-    popOutCurrentMessage();
-    return;
-  }
-  console.log("[popout-window] window.open returned a window object; verifying it stays open\u2026");
-  setTimeout(() => {
+  const subject = currentMessage.subject || "";
+  void (async () => {
     try {
-      console.log(`[popout-window] +600ms: window.closed=${w.closed}`);
+      const { popoutWindow: popoutWindow2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+      const r = await popoutWindow2(a, u, f, subject);
+      if (!r?.ok) {
+        console.log(`[popout-window] daemon declined (${r?.reason || "no reason"}) \u2192 overlay fallback`);
+        popOutCurrentMessage();
+      }
     } catch (e) {
-      console.log(`[popout-window] +600ms: cannot read .closed (${e?.message || e})`);
+      console.log(`[popout-window] popoutWindow failed: ${e?.message || e} \u2192 overlay fallback`);
+      popOutCurrentMessage();
     }
-  }, 600);
+  })();
 }
 function buildPrintableDoc(m) {
   if (!m)
@@ -3117,6 +3109,7 @@ __export(message_list_exports, {
   clearSearchMode: () => clearSearchMode,
   exitMultiSelect: () => exitMultiSelect,
   getCurrentFocused: () => getCurrentFocused,
+  getCurrentView: () => getCurrentView,
   getDateBasis: () => getDateBasis,
   getSelectedMessages: () => getSelectedMessages,
   initMessageList: () => initMessageList,
@@ -3954,8 +3947,20 @@ async function loadSearchResults(query, scope = "all", accountId = "", folderId
     body.innerHTML = `<div class="ml-empty">Search error: ${e.message}</div>`;
   }
 }
-function revealMessage(accountId, folderId, uid, specialUse = "") {
-  loadMessages(accountId, folderId, 1, specialUse, true, uid);
+async function revealMessage(accountId, folderId, uid, specialUse = "") {
+  const prevUnified = unifiedMode;
+  const prevAcct = currentAccountId2, prevFolder = currentFolderId, prevSpecial = currentSpecialUse;
+  await loadMessages(accountId, folderId, 1, specialUse, true, uid);
+  if (getMessages2().some((m) => m.accountId === accountId && m.uid === uid))
+    return true;
+  if (!prevUnified && prevAcct && prevFolder)
+    await loadMessages(prevAcct, prevFolder, 1, prevSpecial, true);
+  else
+    await loadUnifiedInbox(true);
+  return false;
+}
+function getCurrentView() {
+  return { unified: unifiedMode, accountId: currentAccountId2, folderId: currentFolderId, specialUse: currentSpecialUse };
 }
 async function loadMessages(accountId, folderId, page = 1, specialUse = "", autoSelect = true, focusUid) {
   const myGen = ++loadGen;
@@ -6571,6 +6576,18 @@ function setFolderSynced(accountId, folderId, syncedAt) {
 function getFolderSynced(accountId, folderId) {
   return folderLastSync.get(syncKey(accountId, folderId));
 }
+function highlightFolder(accountId, folderId) {
+  const el = accountId === null || folderId === -1 ? document.querySelector(".ft-folder.ft-unified") : document.querySelector(`.ft-folder[data-account-id="${CSS.escape(accountId)}"][data-folder-id="${folderId}"]`);
+  if (!el)
+    return null;
+  if (selectedElement)
+    selectedElement.classList.remove("selected");
+  el.classList.add("selected");
+  selectedElement = el;
+  selectedAccountId = accountId;
+  selectedFolderId = folderId;
+  return el.querySelector(".ft-folder-name")?.textContent || null;
+}
 function formatAge(ms) {
   const secs = Math.round(ms / 1e3);
   if (secs < 60)
@@ -9410,19 +9427,31 @@ var currentAccountId3 = "";
 var currentFolderId2 = 0;
 var reloadDebounceTimer = null;
 var lastListReloadAt = 0;
-function closeSearchAndReveal() {
+async 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);
+    await revealMessage(focused.accountId, focused.folderId, focused.uid);
   } else {
     reloadCurrentFolder();
   }
-  setTitle(APP_NAME);
+  const vw = getCurrentView();
+  if (vw.unified) {
+    highlightFolder(null, -1);
+    setActiveView({ kind: "unified" }, "All Inboxes");
+    setTitle(`${APP_NAME} - All Inboxes`);
+    setNarrowFolderTitle("All Inboxes");
+  } else {
+    currentAccountId3 = vw.accountId;
+    currentFolderId2 = vw.folderId;
+    currentFolderSpecialUse = vw.specialUse;
+    const name = highlightFolder(vw.accountId, vw.folderId) || "Mail";
+    setActiveView({ kind: "folder", accountId: vw.accountId, folderId: vw.folderId, specialUse: vw.specialUse }, name);
+    setTitle(`${APP_NAME} - ${name}`);
+    setNarrowFolderTitle(name);
+  }
 }
 searchInput?.addEventListener("input", () => {
   clearTimeout(searchTimeout);
@@ -10089,6 +10118,16 @@ onWsEvent((event) => {
       }).catch((e) => console.error("openComposeFromMailto failed:", e?.message || e));
       break;
     }
+    case "popoutAction": {
+      const { action, accountId, uid, folderId } = event;
+      if (!action || !accountId || !uid) break;
+      (async () => {
+        const { getMessage: getMessage2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+        const msg = await getMessage2(accountId, uid, false, folderId);
+        document.dispatchEvent(new CustomEvent("mailx-popout-action", { detail: { action, msg, accountId } }));
+      })().catch((e) => console.error(`[popout-window] ${action} failed: ${e?.message || e}`));
+      break;
+    }
   }
 });
 subscribeStore("*", (ev) => {