From e45c26665ca460827963be1a9f45e90b0fc930fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 3 Feb 2021 23:26:07 +0100
Subject: [PATCH] Allow distinct FROM addresses for envelope and header

issue9948
review324741004
---
 user.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/user.py b/user.py
index 4bc3dd8d5f..bcbc093501 100644
--- a/user.py
+++ b/user.py
@@ -40,14 +40,13 @@ logger = logging.getLogger(__name__)
 
 
 def _send_email(from_, users, email_func):
-    if from_ is None:
-        from_ = config.get('email', 'from')
+    from_cfg = config.get('email', 'from')
     for user in users:
         msg, title = email_func(user)
-        msg['From'] = from_
+        msg['From'] = from_ or from_cfg
         msg['To'] = user.email
         msg['Subject'] = Header(title, 'utf-8')
-        sendmail_transactional(from_, [user.email], msg)
+        sendmail_transactional(from_cfg, [user.email], msg)
 
 
 def _add_params(url, **params):