From 0240f520ab2565749b7244e79ca2f30f780af46d Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 30 May 2016 01:50:20 -0700 Subject: [PATCH] #2954 minor fix for when to set HTML alternative --- modules/mailer/mailer.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 6a979969e..13d80b564 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -38,13 +38,11 @@ func NewMessageFrom(to []string, from, subject, htmlBody string) *Message { if err != nil { log.Error(4, "html2text.FromString: %v", err) msg.SetBody("text/html", htmlBody) - msg.AddAlternative("text/html", htmlBody) } else { msg.SetBody("text/plain", body) - } - - if setting.MailService.EnableHTMLAlternative { - msg.AddAlternative("text/html", htmlBody) + if setting.MailService.EnableHTMLAlternative { + msg.AddAlternative("text/html", htmlBody) + } } return &Message{