diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf
new file mode 100644
index 000000000..e895fb0fa
--- /dev/null
+++ b/data/conf/rspamd/local.d/composites.conf
@@ -0,0 +1,4 @@
+MX_IMPLICIT {
+    expression = "MX_GOOD and MX_MISSING";
+    score = -0.01;
+}
diff --git a/data/conf/rspamd/local.d/metrics.conf b/data/conf/rspamd/local.d/metrics.conf
index 4fd0953cc..b3afa78c3 100644
--- a/data/conf/rspamd/local.d/metrics.conf
+++ b/data/conf/rspamd/local.d/metrics.conf
@@ -17,3 +17,20 @@ group "bayes" {
 		description = "Message probably ham, probability: ";
 	}
 }
+group "MX" {
+	symbol "MX_INVALID" {
+	  score = 0.5;
+	  description = "No connectable MX";
+	  one_shot = "true";
+	}
+	symbol "MX_MISSING" {
+	  score = 2.0;
+	  description = "No MX record";
+	  one_shot = "true";
+	}
+	symbol "MX_GOOD" {
+	  score = -0.01;
+	  description = "MX was ok";
+	  one_shot = "true";
+	}
+}
diff --git a/data/conf/rspamd/local.d/mx_check.conf b/data/conf/rspamd/local.d/mx_check.conf
index 6a775a21f..22fcedf19 100644
--- a/data/conf/rspamd/local.d/mx_check.conf
+++ b/data/conf/rspamd/local.d/mx_check.conf
@@ -1,4 +1,4 @@
-timeout = 1.0;
+timeout = 8.0;
 symbol_bad_mx = "MX_INVALID";
 symbol_no_mx = "MX_MISSING";
 symbol_good_mx = "MX_GOOD";