diff --git a/plinth/modules/email_server/audit/spam.py b/plinth/modules/email_server/audit/spam.py
index f325965fa..c9a429f92 100644
--- a/plinth/modules/email_server/audit/spam.py
+++ b/plinth/modules/email_server/audit/spam.py
@@ -60,6 +60,13 @@ egress_filter_cleanup = postconf.ServiceFlags(
 
 egress_filter_cleanup_options = {
     'syslog_name': 'postfix/fbxout',
+    # "From" domain rewriting
+    'sender_canonical_maps': 'regexp:/etc/postfix/freedombox-rewrite-sender',
+    'local_header_rewrite_clients': 'static:all',
+    # "From" domain masquerading
+    'masquerade_domains': '$mydomain',
+    'masquerade_classes': 'envelope_sender,header_sender',
+    # Header privacy
     'header_checks': 'regexp:/etc/postfix/freedombox-header-cleanup',
     'nested_header_checks': ''
 }
diff --git a/plinth/modules/email_server/data/etc/postfix/freedombox-rewrite-sender b/plinth/modules/email_server/data/etc/postfix/freedombox-rewrite-sender
new file mode 100644
index 000000000..713246a80
--- /dev/null
+++ b/plinth/modules/email_server/data/etc/postfix/freedombox-rewrite-sender
@@ -0,0 +1,7 @@
+# -*- mode: conf-space -*-
+# This file is managed by FreedomBox
+# regexp sender canonical map
+
+# Remove the domain part from email addresses
+# Postfix will append @$myhostname
+/^([^@]+)@/ $1