@bobfrankston/rmfmail 1.0.688 → 1.0.690

package/client/app.bundle.js

@@ -1269,7 +1269,9 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       }
     }
     const editBtn2 = document.getElementById("mv-edit-draft");
-    const isDraft = specialUse === "drafts" || specialUse === "outbox";
+    const msgFlags = Array.isArray(msg?.flags) ? msg.flags : [];
+    const flagged = msgFlags.includes("\\Draft");
+    const isDraft = flagged || specialUse === "drafts" || specialUse === "outbox";
     const openDraftInCompose = (cm) => {
       const init = {
         mode: "draft",
@@ -1465,7 +1467,7 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
       installPreviewControls(iframe);
     } else if (msg.bodyText) {
       const pre = document.createElement("pre");
-      pre.style.cssText = "padding: 1rem; white-space: pre-wrap; word-break: break-word;";
+      pre.style.cssText = "padding: 1rem; white-space: pre-wrap; word-break: break-word; font-family: system-ui, sans-serif; font-size: 17.5px; line-height: 1.5; color: #1a1a2e; background: #fff; margin: 0;";
       pre.innerHTML = linkifyText(msg.bodyText);
       bodyEl.appendChild(pre);
     } else {
@@ -1892,6 +1894,18 @@ function popOutCurrentMessage() {
     document.body.classList.toggle("viewer-fullscreen");
     return;
   }
+  const flags = Array.isArray(currentMessage.flags) ? currentMessage.flags : [];
+  if (flags.includes("\\Draft")) {
+    document.dispatchEvent(new CustomEvent("mailx-popout-message", {
+      detail: {
+        accountId: currentAccountId,
+        uid: currentMessage.uid,
+        folderId: currentMessage.folderId,
+        subject: currentMessage.subject
+      }
+    }));
+    return;
+  }
   spawnDesktopPopout(currentMessage, currentAccountId);
 }
 function spawnDesktopPopout(msg, accountId) {
@@ -2264,7 +2278,7 @@ function focusRow(row) {
   row.setSelected(true);
   focusedRow = row;
   row.el.scrollIntoView({ block: "nearest" });
-  showMessage(row.accountId, row.msg.uid, row.msg.folderId, void 0, false, row.msg);
+  showMessage(row.accountId, row.msg.uid, row.msg.folderId, currentSpecialUse || void 0, false, row.msg);
   onMessageSelect(row.accountId, row.msg.uid, row.msg.folderId);
   document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: row.msg }));
   rememberPosition();
@@ -2803,7 +2817,7 @@ async function showThreadPopup(pillEl, headMsg) {
         preview: msg.preview,
         hasAttachments: msg.hasAttachments
       };
-      showMessage(msg.accountId, msg.uid, msg.folderId, void 0, false, envelope);
+      showMessage(msg.accountId, msg.uid, msg.folderId, currentSpecialUse || void 0, false, envelope);
       onMessageSelect(msg.accountId, msg.uid, msg.folderId);
       popup.remove();
     });
@@ -4403,20 +4417,24 @@ async function collectDueAlarms(now) {
       const startMs = ev.startMs || 0;
       if (!startMs)
         continue;
-      const key = occKey(ev.uuid, startMs);
-      if (dismissed[key])
-        continue;
-      const alarm = startMs - CAL_LEAD_MS;
-      const effective = snoozed[key] || alarm;
-      if (effective <= now && effective > now - LOOKBACK_MS) {
-        items.push({
-          uuid: key,
-          kind: "calendar",
-          title: ev.title || "(no title)",
-          alarmMs: effective,
-          whenMs: startMs,
-          htmlLink: ev.htmlLink
-        });
+      const offsets = Array.isArray(ev.reminderMinutes) && ev.reminderMinutes.length > 0 ? ev.reminderMinutes.map((m) => m * 6e4) : [CAL_LEAD_MS];
+      for (const offsetMs of offsets) {
+        const occBaseKey = occKey(ev.uuid, startMs);
+        const key = `${occBaseKey}@${offsetMs}`;
+        if (dismissed[key])
+          continue;
+        const alarm = startMs - offsetMs;
+        const effective = snoozed[key] || alarm;
+        if (effective <= now && effective > now - LOOKBACK_MS) {
+          items.push({
+            uuid: key,
+            kind: "calendar",
+            title: ev.title || "(no title)",
+            alarmMs: effective,
+            whenMs: startMs,
+            htmlLink: ev.htmlLink
+          });
+        }
       }
     }
   } catch {
@@ -9130,6 +9148,26 @@ document.addEventListener("mailx-popout-message", (async (e) => {
     alert(`Couldn't load message: ${err?.message || err}`);
     return;
   }
+  const isDraft = Array.isArray(msg?.flags) && msg.flags.includes("\\Draft");
+  if (isDraft) {
+    const accts = await getAccounts();
+    const init = {
+      mode: "draft",
+      accountId,
+      to: msg.to || [],
+      cc: msg.cc || [],
+      subject: msg.subject || subject || "",
+      bodyHtml: msg.bodyHtml || "",
+      inReplyTo: msg.inReplyTo || "",
+      references: msg.references || [],
+      accounts: accts.map((a) => ({ id: a.id, name: a.name, email: a.email, signature: a.signature, sig: a.sig })),
+      draftUid: msg.uid,
+      draftFolderId: msg.folderId
+    };
+    sessionStorage.setItem("composeInit", JSON.stringify(init));
+    showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");
+    return;
+  }
   const wrapper = document.createElement("div");
   wrapper.className = "popout-overlay";
   wrapper.style.cssText = "position:fixed;top:5vh;right:5vw;width:min(900px,60vw);height:min(800px,80vh);z-index:1500;background:var(--color-bg);border:1px solid var(--color-border);border-radius:6px;box-shadow:0 8px 32px rgba(0,0,0,0.3);display:flex;flex-direction:column;resize:both;overflow:hidden;";
@@ -9157,7 +9195,7 @@ document.addEventListener("mailx-popout-message", (async (e) => {
   wrapper.appendChild(meta);
   wrapper.appendChild(body);
   document.body.appendChild(wrapper);
-  body.srcdoc = msg.bodyHtml || `<pre style="white-space:pre-wrap;font-family:ui-sans-serif">${escapeHtmlBasic(msg.bodyText || "(no body)")}</pre>`;
+  body.srcdoc = msg.bodyHtml ? wrapHtmlBody(msg.bodyHtml, !!msg.remoteAllowed) : `<!DOCTYPE html><html><head><style>body{font-family:system-ui,sans-serif;font-size:17.5px;line-height:1.5;color:#1a1a2e;padding:1rem;margin:0;}pre{white-space:pre-wrap;word-break:break-word;font-family:inherit;font-size:inherit;margin:0;}</style></head><body><pre>${escapeHtmlBasic(msg.bodyText || "(no body)")}</pre></body></html>`;
   let dragX = 0, dragY = 0, dragging = false;
   header.addEventListener("mousedown", (de) => {
     if (de.target.tagName === "BUTTON") return;