diff --git a/mail/postfix/main.cf b/mail/postfix/main.cf
index 2ec11c3..4fc969c 100644
--- a/mail/postfix/main.cf
+++ b/mail/postfix/main.cf
@@ -5,13 +5,8 @@ compatibility_level = 2
 disable_vrfy_command = yes
 mailbox_size_limit = 0
 message_size_limit = 0
-mynetworks_style = subnet
-
-# Custom
-
 mydomain = local
-recipient_delimiter = +
-smtp_helo_name = mail.example.com
+mynetworks_style = subnet
 
 # TLS
 
@@ -21,13 +16,12 @@ smtpd_tls_key_file =  /data/ssl/certs/mail.example.com/privkey.pem
 smtpd_tls_cert_file = /data/ssl/certs/mail.example.com/fullchain.pem
 tls_server_sni_maps = hash:/etc/postfix/sni.cf
 
-# Setup
-
-smtpd_tls_received_header = yes
+# Custom
 
 relay_domains = sqlite:/etc/postfix/relay.cf
 transport_maps = sqlite:/etc/postfix/transport.cf
 
+recipient_delimiter = +
 virtual_mailbox_base = /data/mail/mail
 virtual_uid_maps = static:2000
 virtual_gid_maps = static:2000
@@ -39,13 +33,10 @@ virtual_mailbox_limit = 0
 smtpd_sasl_auth_enable = yes
 smtpd_sasl_type = dovecot
 smtpd_sasl_path = private/auth
-smtpd_sender_login_maps = sqlite:/etc/postfix/login.cf, $virtual_alias_maps
-
-smtpd_delay_reject = no
-smtpd_hard_error_limit = 1
-smtpd_client_restrictions = reject_unknown_reverse_client_hostname
 smtpd_sender_restrictions = reject_sender_login_mismatch
-smtpd_recipient_restrictions = check_recipient_access sqlite:/etc/postfix/access.cf
+smtpd_sender_login_maps = sqlite:/etc/postfix/login.cf, $virtual_alias_maps
 
 smtpd_milters = unix:private/opendkim
 non_smtpd_milters = $smtpd_milters
+
+smtpd_recipient_restrictions = check_recipient_access sqlite:/etc/postfix/access.cf