Update From header for forward-email if changed

2020-01-29 10:47:13 +07:00 · 2020-01-29 10:47:13 +07:00 · 097e96832f
parent 9e2adb42c6
commit 097e96832f
1 changed files with 7 additions and 1 deletions
--- a/email_handler.py
+++ b/email_handler.py
@ -199,7 +199,13 @@ class MailHandler:
        forward_email = ForwardEmail.get_by(
            gen_email_id=gen_email.id, website_email=website_email
        )
-        if not forward_email:
+        if forward_email:
+            # update the From header if needed
+            if forward_email.website_from != msg["From"]:
+                LOG.d("Update From header for %s", forward_email)
+                forward_email.website_from = msg["From"]
+                db.session.commit()
+        else:
            LOG.debug(
                "create forward email for alias %s and website email %s",
                alias,