From e8879454e84ea57a35bcb9a9677bdb3b41b67bef Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 20 Apr 2016 19:38:54 +0530 Subject: [PATCH] [hot] [fix] Add X-Original-From header when replacing sender --- frappe/email/email_body.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 4186b8b1e3..6f71085655 100644 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -176,6 +176,7 @@ class EMail: def replace_sender(self): if cint(self.email_account.always_use_account_email_id_as_sender): + self.original_sender = self.sender sender_name, sender_email = email.utils.parseaddr(self.sender) self.sender = email.utils.formataddr((sender_name or self.email_account.name, self.email_account.email_id)) @@ -198,6 +199,9 @@ class EMail: b'X-Frappe-Site': get_url().encode('utf-8'), } + if cint(self.email_account.always_use_account_email_id_as_sender) and hasattr(self, 'original_sender'): + headers[b'X-Original-From'] = self.original_sender.encode('utf-8') + # reset headers as values may be changed. for key, val in headers.iteritems(): if self.msg_root.has_key(key):