- (int) getpid (), tclock, LocalName ());
- if (msgflags & MFRM)
- fprintf (out, "Sender: %s\n", from);
+ (int) getpid (), (long) tclock, LocalName ());
+ if (msgflags & MFRM) {
+ /* There was already a From: in the draft. Don't add one. */
+ if (!MMailids)
+ /* mts.conf didn't turn on mmailid, 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);
+ }