[GH-15906][MM-22844] Redesign welcome and verify email. (#16824)

Automatic Merge
2021-02-25 23:22:26 -05:00
--- a/services/mailservice/mail.go
+++ b/services/mailservice/mail.go
@@ -287,7 +287,7 @@ func sendMailUsingConfigAdvanced(mail mailData, config *SMTPConfig, enableCompli
 func SendMail(c smtpClient, mail mailData, date time.Time) error {
 	mlog.Debug("sending mail", mlog.String("to", mail.smtpTo), mlog.String("subject", mail.subject))

-	htmlMessage := "\r\n<html><body>" + mail.htmlBody + "</body></html>"
+	htmlMessage := mail.htmlBody

 	txtBody, err := html2text.FromString(mail.htmlBody)
 	if err != nil {