Added in boundary string, plain text

ainsleyclark · ainsleyclark · commit 2a794075560d · 2022-09-20T20:13:38.000+01:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![made-with-Go](https://img.shields.io/badge/Made%20with-Go-1f425f.svg)](http://golang.org)
 [![Go Report Card](https://goreportcard.com/badge/github.com/ainsleyclark/go-mail)](https://goreportcard.com/report/github.com/ainsleyclark/go-mail)
 [![Test](https://github.com/ainsleyclark/go-mail/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/ainsleyclark/go-mail/actions/workflows/test.yml)
-[![codecov](https://codecov.io/gh/ainsleyclark/go-mail/branch/master/graph/badge.svg?token=K27L8LS7DA)](https://codecov.io/gh/ainsleyclark/go-mail)
+[![codecov](https://codecov.io/gh/ainsleyclark/go-mail/branch/main/graph/badge.svg?token=1ZI9R34CHQ)](https://codecov.io/gh/ainsleyclark/go-mail)
 [![go.dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/ainsleyclark/go-mail)
 [![Twitter Handle](https://img.shields.io/twitter/follow/ainsleydev)](https://twitter.com/ainsleydev)
 </div>
diff --git a/drivers/smtp.go b/drivers/smtp.go
@@ -92,6 +92,7 @@ func (m *smtpClient) getTo(t *mail.Transmission) []string {
 // Processes the mail.Transmission and returns the bytes for
 // sending. Mime types are set dependent on the
 // content passed.
+// See: https://gist.github.com/tylermakin/d820f65eb3c9dd98d58721c7fb1939a8?permalink_comment_id=2703291
 func (m *smtpClient) bytes(t *mail.Transmission) []byte {
 	buf := bytes.NewBuffer(nil)
 
@@ -116,18 +117,20 @@ func (m *smtpClient) bytes(t *mail.Transmission) []byte {
 		buf.WriteString(fmt.Sprintf("CC: %s\n", strings.Join(t.CC, ",")))
 	}
 
+	buf.WriteString("\n")
+
 	if t.PlainText != "" {
 		buf.WriteString(fmt.Sprintf("--%s\r\n", boundary))
 		buf.WriteString("Content-Transfer-Encoding: quoted-printable\r\n")
 		buf.WriteString("Content-Type: text/plain; charset=UTF-8\r\n")
-		buf.WriteString(fmt.Sprintf("\r\n%s\r\n", strings.TrimSpace(t.PlainText)))
+		buf.WriteString(fmt.Sprintf("\r\n%s\r\n\n", strings.TrimSpace(t.PlainText)))
 	}
 
 	if t.HTML != "" {
 		buf.WriteString(fmt.Sprintf("--%s\r\n", boundary))
 		buf.WriteString("Content-Transfer-Encoding: quoted-printable\r\n")
 		buf.WriteString("Content-Type: text/html; charset=UTF-8\r\n")
-		buf.WriteString(fmt.Sprintf("\r\n%s\r\n", t.HTML))
+		buf.WriteString(fmt.Sprintf("\r\n%s\r\n\n", t.HTML))
 	}
 
 	if t.HasAttachments() {
@@ -141,5 +144,7 @@ func (m *smtpClient) bytes(t *mail.Transmission) []byte {
 		buf.WriteString("--")
 	}
 
+	buf.WriteString(fmt.Sprintf("--%s--\n", boundary))
+
 	return buf.Bytes()
 }
