summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-11-14 09:11:54 -0300
committerChristopher Speller <crspeller@gmail.com>2016-11-14 07:11:54 -0500
commitbaf1fb6fea7b4afeae7f559f8830bd9493868299 (patch)
treee6eb90f0c9c3bdef746d15aa5295b379cd6e6d16 /utils
parent323ce8b203c570ed6a1dd57b44d6637ad8207616 (diff)
downloadchat-baf1fb6fea7b4afeae7f559f8830bd9493868299.tar.gz
chat-baf1fb6fea7b4afeae7f559f8830bd9493868299.tar.bz2
chat-baf1fb6fea7b4afeae7f559f8830bd9493868299.zip
PLT-4618 Fix email subjects (#4537)
Diffstat (limited to 'utils')
-rw-r--r--utils/mail.go7
1 files changed, 2 insertions, 5 deletions
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) {