From e8879454e84ea57a35bcb9a9677bdb3b41b67bef Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 20 Apr 2016 19:38:54 +0530
Subject: [PATCH 1/2] [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):

From ded3c11f76cabf41b5da0569ffac7164deb5dbc6 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 20 Apr 2016 20:10:20 +0600
Subject: [PATCH 2/2] bumped to version 6.27.12

---
 frappe/__version__.py | 2 +-
 frappe/hooks.py       | 2 +-
 setup.py              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/__version__.py b/frappe/__version__.py
index 22303bf126..b7fdf1768e 100644
--- a/frappe/__version__.py
+++ b/frappe/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.27.11"
+__version__ = "6.27.12"
diff --git a/frappe/hooks.py b/frappe/hooks.py
index c85260f014..d97157e5ec 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies"
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.27.11"
+app_version = "6.27.12"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
diff --git a/setup.py b/setup.py
index 04e2a430e7..32b17bc051 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.27.11"
+version = "6.27.12"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(