vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat(Email Account): make X-Original-From header configurable (#36686)

Browse source 
* feat(Email Account): make `X-Original-From` header configurable

* chore: set `add_x_original_from` to `1`
This commit is contained in:
s-aga-r 2026-02-09 10:46:10 +05:30 • committed by GitHub
parent 786adfd341
commit 2c600ddcd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/email/doctype/email_account/email_account.json
View file

@ -65,6 +65,7 @@
"always_use_account_email_id_as_sender",
"always_use_account_name_as_sender_name",
"send_unsubscribe_message",
"add_x_original_from",
"track_email_status",
"outgoing_mail_settings",
"use_tls",
@ -707,13 +708,19 @@
"fieldname": "last_received_at",
"fieldtype": "Datetime",
"label": "Last Received At"
},
{
"default": "1",
"fieldname": "add_x_original_from",
"fieldtype": "Check",
"label": "Add X-Original-From header"
}
],
"icon": "fa fa-inbox",
"index_web_pages_for_search": 1,
"links": [],
"make_attachments_public": 1,
"modified": "2025-08-20 11:35:14.540578",
"modified": "2026-02-04 15:50:27.898578",
"modified_by": "Administrator",
"module": "Email",
"name": "Email Account",

1
frappe/email/doctype/email_account/email_account.py
View file

@ -61,6 +61,7 @@ class EmailAccount(Document):
from frappe.types import DF
add_signature: DF.Check
add_x_original_from: DF.Check
always_bcc: DF.Data | None
always_use_account_email_id_as_sender: DF.Check
always_use_account_name_as_sender_name: DF.Check

4
frappe/email/email_body.py
View file

@ -276,7 +276,9 @@ class EMail:
validate_email_address(strip(self.sender), True)
self.reply_to = validate_email_address(strip(self.reply_to) or self.sender, True)
self.set_header("X-Original-From", self.sender)
if self.email_account.add_x_original_from:
self.set_header("X-Original-From", self.sender)
self.replace_sender()
self.replace_sender_name()

1
frappe/patches.txt
View file

@ -257,3 +257,4 @@ execute:frappe.db.set_single_value("Desktop Settings", "icon_style", "Solid")
execute:frappe.delete_doc_if_exists("Workspace Sidebar", "Productivity")
frappe.patches.v16_0.unset_standard_field_for_auto_generated_icons
execute:from frappe.email.doctype.notification.notification import install_notification_templates; install_notification_templates()
execute:frappe.db.set_value("Email Account", {}, "add_x_original_from", 1)