jordan-wright#147 Proper handling of utf-8 characters in reply-to hea…

…ders

.github/workflows/test.yml

@@ -11,6 +11,8 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    env:
+      GO111MODULE: auto
     steps:
 
     - name: Set up Go 1.x

email.go

@@ -763,7 +763,7 @@ func headerToBytes(buff io.Writer, header textproto.MIMEHeader) {
 			switch {
 			case field == "Content-Type" || field == "Content-Disposition":
 				buff.Write([]byte(subval))
-			case field == "From" || field == "To" || field == "Cc" || field == "Bcc":
+			case field == "From" || field == "To" || field == "Cc" || field == "Bcc" || field == "Reply-To":
 				participants := strings.Split(subval, ",")
 				for i, v := range participants {
 					addr, err := mail.ParseAddress(v)

email_test.go

@@ -397,6 +397,11 @@ func TestHeaderEncoding(t *testing.T) {
 			have:  "Needs Encóding <encoding@example.com>, Only ASCII <foo@example.com>",
 			want:  "=?utf-8?q?Needs_Enc=C3=B3ding?= <encoding@example.com>, \"Only ASCII\" <foo@example.com>\r\n",
 		},
+		{
+			field: "Reply-To",
+			have:  "Needs Encóding <encoding@example.com>, Only ASCII <foo@example.com>",
+			want:  "=?utf-8?q?Needs_Enc=C3=B3ding?= <encoding@example.com>, \"Only ASCII\" <foo@example.com>\r\n",
+		},
 		{
 			field: "To",
 			have:  "Keith Moore <moore@cs.utk.edu>, Keld Jørn Simonsen <keld@dkuug.dk>",
@@ -523,6 +528,7 @@ func TestNonAsciiEmailFromReader(t *testing.T) {
 	ex := &Email{
 		Subject: "Test Subject",
 		To:      []string{"Anaïs <anais@example.org>"},
+		ReplyTo: []string{"Anaïs <anais@example.org>"},
 		Cc:      []string{"Patrik Fältström <paf@example.com>"},
 		From:    "Mrs Valérie Dupont <valerie.dupont@example.com>",
 		Text:    []byte("This is a test message!"),
@@ -532,6 +538,7 @@ func TestNonAsciiEmailFromReader(t *testing.T) {
 Subject: =?UTF-8?Q?Test Subject?=
 From: Mrs =?ISO-8859-1?Q?Val=C3=A9rie=20Dupont?= <valerie.dupont@example.com>
 To: =?utf-8?q?Ana=C3=AFs?= <anais@example.org>
+Reply-To: =?utf-8?q?Ana=C3=AFs?= <anais@example.org>
 Cc: =?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= <paf@example.com>
 Content-type: text/plain; charset=ISO-8859-1
 
@@ -549,6 +556,9 @@ This is a test message!`)
 	if e.To[0] != ex.To[0] {
 		t.Fatalf("Incorrect \"To\": %#q != %#q", e.To, ex.To)
 	}
+	if e.ReplyTo[0] != ex.ReplyTo[0] {
+		t.Fatalf("Incorrect \"Reply-To\": %#q != %#q", e.ReplyTo, ex.ReplyTo)
+	}
 	if e.Cc[0] != ex.Cc[0] {
 		t.Fatalf("Incorrect \"Cc\": %#q != %#q", e.Cc, ex.Cc)
 	}