From baf1fb6fea7b4afeae7f559f8830bd9493868299 Mon Sep 17 00:00:00 2001 From: enahum Date: Mon, 14 Nov 2016 09:11:54 -0300 Subject: PLT-4618 Fix email subjects (#4537) --- utils/mail.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'utils/mail.go') diff --git a/utils/mail.go b/utils/mail.go index bb3ee7b17..6a348e52e 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -5,10 +5,10 @@ package utils import ( "crypto/tls" - "encoding/base64" "fmt" l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/model" + "mime" "net" "net/mail" "net/smtp" @@ -16,10 +16,7 @@ import ( ) func encodeRFC2047Word(s string) string { - // TODO: use `mime.BEncoding.Encode` instead when `go` >= 1.5 - // return mime.BEncoding.Encode("utf-8", s) - dst := base64.StdEncoding.EncodeToString([]byte(s)) - return "=?utf-8?b?" + dst + "?=" + return mime.BEncoding.Encode("utf-8", s) } func connectToSMTPServer(config *model.Config) (net.Conn, *model.AppError) { -- cgit v1.2.3-1-g7c22