From 2321b4b272c568ebcebf993c051c8ab60f651748 Mon Sep 17 00:00:00 2001
From: Peter <peter@smitmail.eu>
Date: Fri, 19 Dec 2014 22:33:17 +0200
Subject: [PATCH] Change from header in email, fixes #765
---
conf/app.ini | 2 +-
modules/mailer/mailer.go | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/conf/app.ini b/conf/app.ini
index d6ee6ae4d..d11788467 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
+; Mail from address. This can be just an email address, or the "Name" <email@example.com> format (including the quotes and brackets)
FROM =
; Mailer user name and password
USER =
diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index 211ad59cd..22f403ee5 100644
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@@ -35,8 +35,7 @@ func (m Message) Content() string {
}
// create mail content
- content := "From: \"" + m.From + "\" <" + m.User +
- ">\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body
+ content := "From: " + m.From +"\r\nSubject: " + m.Subject + "\r\nContent-Type: " + contentType + "\r\n\r\n" + m.Body
return content
}