X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpost.c;h=f880152a2b3182d1595247112133a41d6b292b1b;hp=4ca59553556f52f7e9ebce1002267d1b506537a9;hb=389877bae1fe1a9f7259b8979f6a930744d90fab;hpb=84591551ae36c592f59bd369027397ef9f934602

diff --git a/uip/post.c b/uip/post.c
index 4ca5955..f880152 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -1167,7 +1167,18 @@ make_bcc_file (int dashstuff)
     if (msgid)
 	fprintf (out, "Message-ID: <%d.%ld@%s>\n",
 		(int) getpid (), (long) tclock, LocalName ());
-    fprintf (out, "From: %s\n", signature);
+    if (msgflags & MFRM) {
+      /* There was already a From: in the draft.  Don't add one. */
+      if (!draft_from_masquerading)
+        /* mts.conf didn't contain "masquerade:[...]draft_from[...]"
+           so we'll reveal the user's actual account@thismachine
+           address in a Sender: header (and use it as the envelope
+           From: later). */
+        fprintf (out, "Sender: %s\n", from);
+    }
+    else
+      /* Construct a From: header. */
+      fprintf (out, "From: %s\n", signature);
     if (subject)
 	fprintf (out, "Subject: %s", subject);
     fprintf (out, "BCC:\n");