Parse the from string to extract the email address

1 files changed, 6 insertions, 1 deletions

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 {