From 95ee806a93cebe37113196a2e2874d92242048ee Mon Sep 17 00:00:00 2001
From: Brandon McDonnell <brandon@sophiasolutions.org>
Date: Sat, 20 Oct 2018 13:56:50 +0000
Subject: [PATCH] smtp: Add sender address to message. Protonmail now expects
 it.

---
 smtp/smtp.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/smtp/smtp.go b/smtp/smtp.go
index 13e9818..60a8783 100644
--- a/smtp/smtp.go
+++ b/smtp/smtp.go
@@ -95,6 +95,11 @@ 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),
@@ -102,6 +107,7 @@ func (u *user) Send(from string, to []string, r io.Reader) error {
 		Subject:   subject,
 		Header:    formatHeader(mr.Header),
 		AddressID: fromAddr.ID,
+		Sender:    senderAddress,
 	}
 
 	// Create an empty draft