jarno
/
hydroxide-push
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

smtp: populate sender from From header

This commit is contained in:
emersion 2018-10-21 12:34:47 +02:00
parent 0248c4c722
commit 6f5f315be9
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
smtp/smtp.go
View File

@ -64,7 +64,8 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
return errors.New("no recipient specified")
}
fromAddrStr := fromList[0].Address
rawFrom := fromList[0]
fromAddrStr := rawFrom.Address
var fromAddr *protonmail.Address
for _, addr := range u.addrs {
if strings.EqualFold(addr.Email, fromAddrStr) {
@ -96,11 +97,6 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
return errors.New("sender address key hasn't been decrypted")
}
senderAddress := &protonmail.MessageAddress{
Address: fromAddr.Email,
Name: fromAddr.DisplayName,
}
msg := &protonmail.Message{
ToList: toPMAddressList(toList),
CCList: toPMAddressList(ccList),
@ -108,7 +104,10 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
Subject: subject,
Header: formatHeader(mr.Header),
AddressID: fromAddr.ID,
Sender: senderAddress,
Sender: &protonmail.MessageAddress{
Address: rawFrom.Address,
Name: rawFrom.Name,
},
}
// Create an empty draft