@bobfrankston/rmfmail 1.2.200 → 1.2.202

package/bin/rmfshare-src/Program.cs

@@ -49,8 +49,16 @@ internal static class Program
             if (activation is ShareTargetActivatedEventArgs share)
             {
                 HandleShare(share).GetAwaiter().GetResult();
+                // Handoff launch: a RUNNING daemon consumes pending-share.json
+                // via fs.watch; the spawned mailx.js must exit instead of
+                // replace-on-launch restarting the whole app (Bob 2026-07-30).
+                LaunchDaemon(handoff: true);
+            }
+            else
+            {
+                // Plain double-click — a normal launch (replace is fine).
+                LaunchDaemon(handoff: false);
             }
-            LaunchDaemon();
             return 0;
         }
         catch (Exception ex)
@@ -173,7 +181,7 @@ internal static class Program
     /// running the new process exits at the instance check (fs.watch on the
     /// pending file has already fired); otherwise it becomes the daemon and
     /// the client's startup poll consumes the file.
-    private static void LaunchDaemon()
+    private static void LaunchDaemon(bool handoff)
     {
         var mailxJs = Environment.GetEnvironmentVariable("RMFMAIL_JS");
         if (string.IsNullOrEmpty(mailxJs) || !File.Exists(mailxJs))
@@ -203,6 +211,10 @@ internal static class Program
             WorkingDirectory = Path.GetDirectoryName(mailxJs)!,
         };
         psi.ArgumentList.Add(mailxJs);
+        // Tells mailx.js this is a share handoff: exit if a daemon is
+        // already running (it has the pending file) instead of the default
+        // replace-on-launch, which restarted the whole app mid-share.
+        if (handoff) psi.ArgumentList.Add("--handoff");
         Process.Start(psi);
     }
 

package/client/android-bootstrap.bundle.js

@@ -6346,7 +6346,7 @@ ${inner.body}`;
     await this.syncManager.undeleteMessage(accountId, uid, folderId);
   }
   // ── Drafts ──
-  async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId) {
+  async saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId, bcc, from) {
     const settings = await loadSettings();
     const account = settings.accounts.find((a) => a.id === accountId);
     if (!account)
@@ -6355,9 +6355,12 @@ ${inner.body}`;
     const body = bodyHtml || bodyText || "";
     const bodyEncoded = encodeQuotedPrintable(body);
     const headers = [
-      `From: ${account.name} <${account.email}>`,
+      // Same rule as desktop: the compose From (reply-to-alias) wins
+      // over the account default (Bob 2026-07-30).
+      `From: ${from?.trim() || `${account.name} <${account.email}>`}`,
       to ? `To: ${to}` : null,
       cc ? `Cc: ${cc}` : null,
+      bcc ? `Bcc: ${bcc}` : null,
       `Subject: ${subject || "(no subject)"}`,
       `Date: ${(/* @__PURE__ */ new Date()).toUTCString()}`,
       `X-Mailx-Draft-ID: ${id}`,
@@ -11556,7 +11559,7 @@ function installBridge() {
       await service.send(msg);
       return { ok: true };
     },
-    saveDraft: (p) => service.saveDraft(p.accountId, p.subject, p.bodyHtml, p.bodyText, p.to, p.cc, p.previousDraftUid, p.draftId),
+    saveDraft: (p) => service.saveDraft(p.accountId, p.subject, p.bodyHtml, p.bodyText, p.to, p.cc, p.previousDraftUid, p.draftId, p.bcc, p.from),
     deleteDraft: async (accountId, draftUid) => {
       await service.deleteDraft(accountId, draftUid);
       return { ok: true };