diff --git a/data/conf/rspamd/custom/global_from_blacklist.map b/data/conf/rspamd/custom/global_mime_from_blacklist.map
similarity index 100%
rename from data/conf/rspamd/custom/global_from_blacklist.map
rename to data/conf/rspamd/custom/global_mime_from_blacklist.map
diff --git a/data/conf/rspamd/custom/global_from_whitelist.map b/data/conf/rspamd/custom/global_mime_from_whitelist.map
similarity index 100%
rename from data/conf/rspamd/custom/global_from_whitelist.map
rename to data/conf/rspamd/custom/global_mime_from_whitelist.map
diff --git a/data/conf/rspamd/custom/global_smtp_from_blacklist.map b/data/conf/rspamd/custom/global_smtp_from_blacklist.map
new file mode 100644
index 000000000..3c872889c
--- /dev/null
+++ b/data/conf/rspamd/custom/global_smtp_from_blacklist.map
@@ -0,0 +1 @@
+# /.+example\.com/i
diff --git a/data/conf/rspamd/custom/global_smtp_from_whitelist.map b/data/conf/rspamd/custom/global_smtp_from_whitelist.map
new file mode 100644
index 000000000..3c872889c
--- /dev/null
+++ b/data/conf/rspamd/custom/global_smtp_from_whitelist.map
@@ -0,0 +1 @@
+# /.+example\.com/i
diff --git a/data/conf/rspamd/local.d/multimap.conf b/data/conf/rspamd/local.d/multimap.conf
index 47eca4ff8..7752b8135 100644
--- a/data/conf/rspamd/local.d/multimap.conf
+++ b/data/conf/rspamd/local.d/multimap.conf
@@ -34,17 +34,35 @@ LOCAL_BL_ASN {
   symbols_set = ["LOCAL_BL_ASN"];
 }
 
-GLOBAL_FROM_WL {
+GLOBAL_SMTP_FROM_WL {
   type = "from";
-  map = "$LOCAL_CONFDIR/custom/global_from_whitelist.map";
+  map = "$LOCAL_CONFDIR/custom/global_smtp_from_whitelist.map";
   regexp = true;
   prefilter = true;
   action = "accept";
 }
 
-GLOBAL_FROM_BL {
+GLOBAL_SMTP_FROM_BL {
   type = "from";
-  map = "$LOCAL_CONFDIR/custom/global_from_blacklist.map";
+  map = "$LOCAL_CONFDIR/custom/global_smtp_from_blacklist.map";
+  regexp = true;
+  prefilter = true;
+  action = "reject";
+}
+
+GLOBAL_MIME_FROM_WL {
+  type = "header";
+  header = "from";
+  map = "$LOCAL_CONFDIR/custom/global_mime_from_whitelist.map";
+  regexp = true;
+  prefilter = true;
+  action = "accept";
+}
+
+GLOBAL_MIME_FROM_BL {
+  type = "header";
+  header = "from";
+  map = "$LOCAL_CONFDIR/custom/global_mime_from_blacklist.map";
   regexp = true;
   prefilter = true;
   action = "reject";