diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index ba8f9944e..be67c238d 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		postfix
-PLUGIN_VERSION=		1.21
+PLUGIN_VERSION=		1.22
 PLUGIN_COMMENT=		SMTP mail relay
 PLUGIN_DEPENDS=		postfix35
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/mail/postfix/pkg-descr b/mail/postfix/pkg-descr
index 0fd8e0cca..b45544ba6 100644
--- a/mail/postfix/pkg-descr
+++ b/mail/postfix/pkg-descr
@@ -6,6 +6,10 @@ is completely different.
 Plugin Changelog
 ================
 
+1.22
+
+* Switch table format of header_checks from regexp_table to pcre_table (contributed by Starkstromkonsument)
+
 1.21
 
 * Add static link to root certficiates
diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
index 3dcc6292b..c4de83da0 100644
--- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
+++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf
@@ -35,8 +35,8 @@ virtual_alias_maps = hash:/usr/local/etc/postfix/virtual
 sender_bcc_maps = hash:/usr/local/etc/postfix/senderbcc
 recipient_bcc_maps = hash:/usr/local/etc/postfix/recipientbcc
 sender_canonical_maps = regexp:/usr/local/etc/postfix/sendercanonical
-header_checks = regexp:/usr/local/etc/postfix/header_checks_receiving
-smtp_header_checks = regexp:/usr/local/etc/postfix/header_checks_delivering
+header_checks = pcre:/usr/local/etc/postfix/header_checks_receiving
+smtp_header_checks = pcre:/usr/local/etc/postfix/header_checks_delivering
 smtp_tls_CAfile = /etc/ssl/cert.pem
 ##########################
 # END SYSTEM DEFAULTS