@bobfrankston/rmfmail 1.2.83 → 1.2.85

package/client/app.ts

@@ -1075,6 +1075,14 @@ async function openCompose(mode: ComposeMode, overrideMsg?: any, overrideAccount
         init.cc = Array.isArray(msg.cc) ? msg.cc : [];
         init.subject = msg.subject || "";
         init.bodyHtml = editAsNewBody(msg);
+        // From: preserve the original sender when it's one of YOUR accounts
+        // (resending your own message keeps the same identity); otherwise fall
+        // back to received-identity detection. Without this, edit-as-new always
+        // defaulted to the primary account — "a different from address" (Bob
+        // 2026-06-29).
+        const origFrom = msg.from?.address ? bareAddress(msg.from.address) : "";
+        const ownFrom = origFrom && accounts.some((acc: any) => bareAddress(acc.email || "") === origFrom) ? origFrom : undefined;
+        init.fromAddress = ownFrom || detectReplyFrom();
     }
 
     // Carry the original message's attachments into forward / edit-as-new so

package/client/compose/compose.bundle.js

@@ -4549,6 +4549,7 @@ async function saveDraft2() {
   window.__mailxSaveDraft = saveDraft2;
   lastDraftContent = content;
   draftSaving = true;
+  if (!draftId) draftId = `mailx-draft-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   try {
     const data = await saveDraft({
       accountId: getFromAccountId(),