From fd04243ebf68c5b1b35550d7232f3ecf550f003b Mon Sep 17 00:00:00 2001 From: Winni Neessen Date: Sun, 13 Mar 2022 19:04:58 +0100 Subject: [PATCH] Fix for msgwriter.go --- msgwriter.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/msgwriter.go b/msgwriter.go index 98c8311..460e82d 100644 --- a/msgwriter.go +++ b/msgwriter.go @@ -101,11 +101,17 @@ func (mw *msgWriter) newPart(h map[string][]string) { // writePart writes the corresponding part to the Msg body func (mw *msgWriter) writePart(p *Part, cs Charset) { - mh := textproto.MIMEHeader{} - mh.Add(string(HeaderContentType), fmt.Sprintf("%s; charset=%s", - p.ctype, cs)) - mh.Add(string(HeaderContentTransferEnc), string(p.enc)) + ct := fmt.Sprintf("%s; charset=%s", p.ctype, cs) + cte := fmt.Sprintf("%s", p.enc) + if mw.d == 0 { + mw.writeHeader(HeaderContentType, ct) + mw.writeHeader(HeaderContentTransferEnc, cte) + mw.writeString("\r\n") + } if mw.d > 0 { + mh := textproto.MIMEHeader{} + mh.Add(string(HeaderContentType), ct) + mh.Add(string(HeaderContentTransferEnc), cte) mw.newPart(mh) } mw.writeBody(p.w, p.enc)