diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction
--- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction	2020-03-26 00:20:11.371000000 -0400
+++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction	2020-03-26 00:24:55.338000000 -0400
@@ -8,5 +8,9 @@
 	my $mlog = ($mailog eq "enabled")? "/var/log/php/php$PHP_VERSION/mail.log" : "";
 	$OUT .= "$mlog";
 }
-mail.add_x_header                      = On
+mail.add_x_header                      = {
+        my $axh = $php{MailAddXHeader} || "disabled";
+        my $ax = ($axh eq "enabled") ? "Yes" : "No";
+	$OUT .= "$ax";
+}