Don't enforce return path, and check for leading <

davidbanham · Jun 15, 2022 · 258e0d1 · 258e0d1
1 parent 5451b61
commit 258e0d1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/mime.go b/mime.go
@@ -97,9 +97,11 @@ func (email Email) WriteMime(dest io.Writer) error {
 	dest.Write([]byte("From: " + email.From + "\r\n"))
 	dest.Write([]byte("To: " + email.To + "\r\n"))
 	if email.ReturnPath != "" {
-		dest.Write([]byte("Return-Path: <" + email.ReturnPath + ">\r\n"))
-	} else {
-		dest.Write([]byte("Return-Path: <" + email.From + ">\r\n"))
+		if email.ReturnPath[0] == "<" {
+			dest.Write([]byte("Return-Path: " + email.ReturnPath + "\r\n"))
+		} else {
+			dest.Write([]byte("Return-Path: <" + email.ReturnPath + ">\r\n"))
+		}
 	}
 	if email.ReplyTo != "" {
 		dest.Write([]byte("Reply-To: " + email.ReplyTo + "\r\n"))