Merge branch 'hotfix'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.27.11"
+__version__ = "6.27.12"

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):

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"

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(