--- a/src/context.cpp	Sun Sep 25 08:38:29 2005 -0700
+++ b/src/context.cpp	Mon Sep 26 20:40:29 2005 -0700
@@ -187,12 +187,16 @@
 
 
 int SMTP::from(char *f) {
+	// the mail from address was originally passed in from sendmail enclosed in
+	// <>. to_lower_string() removed the <> and converted the rest to lowercase,
+	// except in the case of an empty return path, which was left as the two
+	// character string <>.
 	if (strncmp(efrom, f, maxlen)) {
 		rset();
 		strncpy(efrom, f, maxlen);
 		init();
 		append("MAIL FROM:<");
-		append(f);
+		if (*f != '<') append(f);
 		append(">");
 		return cmd(NULL);
 	}