X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fspost.c;h=7a59d591a3f36ad37d6c3e5ff5e4676c08fd911a;hb=bc38ebb2e95e0a4d4a672b49366130f433e72aec;hp=9b2ffcbc932ba3925180424353dff07486b7f62f;hpb=4cb212cf82fa0c832ee3247da33e733f5cce04d6;p=mmh

diff --git a/uip/spost.c b/uip/spost.c
index 9b2ffcb..7a59d59 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -430,7 +430,7 @@ finish_headers(FILE *out)
 		fprintf(out, "%sDate: %s\n", resentstr, dtimenow());
 	}
 
-	strncpy(from, getusername(), sizeof(from));
+	snprintf(from, sizeof(from), "%s@%s", getusername(), LocalName());
 	if ((cp = getfullname()) && *cp) {
 		snprintf(signature, sizeof(signature), "%s <%s>", cp, from);
 	} else {
@@ -439,11 +439,14 @@ finish_headers(FILE *out)
 	if (!(msgflags & MFRM)) {
 		fprintf(out, "%sFrom: %s\n", resentstr, signature);
 	} else {
-		/* In case the From: header contains multiple addresses. */
+		/*
+		** Add a Sender: header because the From: header could
+		** be fake or contain multiple addresses.
+		*/
 		fprintf(out, "%sSender: %s\n", resentstr, from);
 	}
 	if (!(msgflags & MVIS)) {
-		fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr);
+		fprintf(out, "%sBcc: undisclosed-recipients:;\n", resentstr);
 	}
 	if (badmsg) {
 		unlink(tmpfil);