From d2b389bebccce9eb932f57b2ec39e69b0bf7b506 Mon Sep 17 00:00:00 2001
From: Peter Grlica <peter.grlica@gmail.com>
Date: Thu, 1 Jun 2023 15:02:17 +0200
Subject: [PATCH] Fixed From header on env SMTP vars

---
 server/app/boot_levels.go                  |  1 +
 server/system/service/auth_notification.go | 14 +-------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/server/app/boot_levels.go b/server/app/boot_levels.go
index 42aba33d2..cfe1d3739 100644
--- a/server/app/boot_levels.go
+++ b/server/app/boot_levels.go
@@ -973,6 +973,7 @@ func setupSmtpDialer(log *zap.Logger, servers ...types.SmtpServers) {
 		zap.String("host", s.Host),
 		zap.Int("port", s.Port),
 		zap.String("user", s.User),
+		zap.String("from", s.From),
 		logger.Mask("pass", s.Pass),
 		zap.Bool("tsl-insecure", s.TlsInsecure),
 		zap.String("tls-server-name", s.TlsServerName),
diff --git a/server/system/service/auth_notification.go b/server/system/service/auth_notification.go
index 1f9674af6..ac371eff7 100644
--- a/server/system/service/auth_notification.go
+++ b/server/system/service/auth_notification.go
@@ -76,17 +76,7 @@ func (svc authNotification) InviteEmail(ctx context.Context, emailAddress string
 }
 
 func (svc authNotification) newMail() *gomail.Message {
-	var (
-		m    = mail.New()
-		addr = svc.settings.Auth.Mail.FromAddress
-		name = svc.settings.Auth.Mail.FromName
-	)
-
-	if addr != "" {
-		m.SetAddressHeader("From", addr, name)
-	}
-
-	return m
+	return mail.New()
 }
 
 func (svc authNotification) send(ctx context.Context, name, sendTo string, payload map[string]interface{}) error {
@@ -117,8 +107,6 @@ func (svc authNotification) send(ctx context.Context, name, sendTo string, paylo
 	// Prepare payload
 	payload["Logo"] = htpl.URL(svc.settings.General.Mail.Logo)
 	payload["BaseURL"] = svc.opt.BaseURL
-	payload["SignatureName"] = svc.settings.Auth.Mail.FromName
-	payload["SignatureEmail"] = svc.settings.Auth.Mail.FromAddress
 	payload["EmailAddress"] = sendTo
 
 	// Render document