@bobfrankston/rmfmail 1.2.200 → 1.2.201

package/packages/mailx-service/index.js

@@ -3611,7 +3611,7 @@ export class MailxService {
         }
     }
     // ── Drafts ──
-    async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId, bcc) {
+    async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId, bcc, from) {
         // Local-first: commit the draft to the local filesystem synchronously
         // and return immediately. The IMAP APPEND (and the previous-draft
         // delete) run in the background. Previously this method awaited IMAP
@@ -3638,7 +3638,13 @@ export class MailxService {
         const body = bodyHtml || bodyText || "";
         const bodyEncoded = encodeQuotedPrintable(body);
         const headers = [
-            `From: ${account.name} <${account.email}>`,
+            // The compose From field wins — a reply to a message delivered to
+            // an alias carries that alias, and the draft must keep it. The
+            // account default stamped here unconditionally made every draft
+            // claim the primary identity even when compose showed the alias
+            // (Bob 2026-07-30: hackers-list reply drafted as rmfmail@bob.ma
+            // while the actual send correctly used hackers@bobf…).
+            `From: ${from?.trim() || `${account.name} <${account.email}>`}`,
             // Bcc belongs IN a draft — it's the send path that strips it.
             // Without it, editing a saved draft silently lost the Bcc list.
             to ? `To: ${to}` : null, cc ? `Cc: ${cc}` : null, bcc ? `Bcc: ${bcc}` : null,