From edbe1de026cbc6d138a4382a3207c9f4f8280193 Mon Sep 17 00:00:00 2001
From: Peter <peter@smitmail.eu>
Date: Fri, 19 Dec 2014 22:48:21 +0200
Subject: [PATCH] Remove unused "User" member of Message Struct and fix bounce
 address

The User member of a message is not needed anymore.

The from that is send to the server, should always be the "system" from. This is also called the Bounce address http://en.wikipedia.org/wiki/Bounce_address
---
 modules/mailer/mail.go   |  4 +---
 modules/mailer/mailer.go | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
index 6c73e7e58f..611e7d8dbd 100644
--- a/modules/mailer/mail.go
+++ b/modules/mailer/mail.go
@@ -30,9 +30,7 @@ const (
 
 // Create New mail message use MailFrom and MailUser
 func NewMailMessageFrom(To []string, from, subject, body string) Message {
-	msg := NewHtmlMessage(To, from, subject, body)
-	msg.User = setting.MailService.User
-	return msg
+	return NewHtmlMessage(To, from, subject, body)
 }
 
 // Create New mail message use MailFrom and MailUser
diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go
index 22f403ee51..3ce14822f7 100644
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@@ -20,7 +20,6 @@ type Message struct {
 	From    string
 	Subject string
 	Body    string
-	User    string
 	Type    string
 	Massive bool
 	Info    string
@@ -35,7 +34,7 @@ func (m Message) Content() string {
 	}
 
 	// create mail content
-	content := "From: " + m.From +"\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
 }
 
@@ -66,7 +65,7 @@ func processMailQueue() {
 }
 
 // sendMail allows mail with self-signed certificates.
-func sendMail(settings *setting.Mailer, from string, recipients []string, msgContent []byte) error {
+func sendMail(settings *setting.Mailer, recipients []string, msgContent []byte) error {
 	host, port, err := net.SplitHostPort(settings.Host)
 	if err != nil {
 		return err
@@ -125,7 +124,7 @@ func sendMail(settings *setting.Mailer, from string, recipients []string, msgCon
 		}
 	}
 
-	if err = client.Mail(from); err != nil {
+	if err = client.Mail(settings.From); err != nil {
 		return err
 	}
 
@@ -168,7 +167,7 @@ func Send(msg *Message) (int, error) {
 		num := 0
 		for _, to := range msg.To {
 			body := []byte("To: " + to + "\r\n" + content)
-			err := sendMail(setting.MailService, msg.From, []string{to}, body)
+			err := sendMail(setting.MailService, []string{to}, body)
 			if err != nil {
 				return num, err
 			}
@@ -179,7 +178,7 @@ func Send(msg *Message) (int, error) {
 		body := []byte("To: " + strings.Join(msg.To, ";") + "\r\n" + content)
 
 		// send to multiple emails in one message
-		err := sendMail(setting.MailService, msg.From, msg.To, body)
+		err := sendMail(setting.MailService, msg.To, body)
 		if err != nil {
 			return 0, err
 		} else {