X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhmail.c;h=6c5039c63b25003209ae990994982fd968316183;hb=0ecdc197e9a9a4d2bb6dce395dea152fbc728b6b;hp=f5e5384adcc45248c9faf30a87d367cf0523ffe7;hpb=13ae9ba066e6b8c114daa6714895a56816465f49;p=mmh

diff --git a/uip/mhmail.c b/uip/mhmail.c
index f5e5384..6c5039c 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/mts.h>
 #include <h/signals.h>
 #include <h/utils.h>
 #include <signal.h>
@@ -84,10 +85,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [addrs ... [switches]]",
 			invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case FROMSW: 
 		    if (!(from = *argp++) || *from == '-')
@@ -140,6 +141,8 @@ main (int argc, char **argv)
 	fprintf (out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
     if (from)
 	fprintf (out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
+    else
+	fprintf (out, "From: %s\n", getlocalmbox ());
     if (!resent)
 	fputs ("\n", out);