diff options
| -rw-r--r-- | conf/app.ini | 2 | ||||
| -rw-r--r-- | modules/mailer/mailer.go | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini index d117884676..4c2d146bbe 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -98,7 +98,7 @@ SUBJECT = %(APP_NAME)s HOST = ; Do not verify the certificate of the server. Only use this for self-signed certificates SKIP_VERIFY = -; Mail from address. This can be just an email address, or the "Name" <email@example.com> format (including the quotes and brackets) +; Mail from address, RFC 5322. This can be just an email address, or the "Name" <email@example.com> format FROM = ; Mailer user name and password USER = diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 3ce14822f7..fd10c1e5a9 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -8,6 +8,7 @@ import ( "crypto/tls" "fmt" "net" + "net/mail" "net/smtp" "strings" @@ -124,8 +125,12 @@ func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte) } } - if err = client.Mail(settings.From); err != nil { + if fromAddress, err := mail.ParseAddress(settings.From); err != nil { return err + } else { + if err = client.Mail(fromAddress.Address); err != nil { + return err + } } for _, rec := range recipients { |