diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All
--- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All	2021-03-06 23:17:38.962000000 -0500
+++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All	2021-03-06 23:46:29.548000000 -0500
@@ -29,6 +29,7 @@
   my $display_errors      = $pool->prop('DisplayErrors')     || 'disabled';
   my $log_errors          = $pool->prop('LogErrors')         || 'disabled';
   my $autoprepend         = $pool->prop('AutoPrependFile')  || 'enabled';
+  my $MailForceSender     = $pool->prop('MailForceSender')  || "php\@$DomainName";
 
   # Format vars
   my $autoprep            = ( $autoprepend eq "disabled") ? "" : "/usr/share/php/auth_translation.php";
@@ -61,7 +62,7 @@
 php_admin_value[opcache.file_cache]  = /var/lib/php/$key/opcache
 php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp
 php_admin_value[sys_temp_dir] = /var/lib/php/$key/tmp
-php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
+php_admin_value[mail.force_extra_parameters]            = '-f $MailForceSender'
 php_admin_flag[display_errors] = $display_errors
 php_admin_flag[log_errors] = $log_errors
 php_admin_value[error_log] = /var/log/php/$key/error.log
diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays
--- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays	2021-03-06 23:17:38.962000000 -0500
+++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays	2021-03-06 23:46:50.213000000 -0500
@@ -27,7 +27,8 @@
                                                                     'passthru,phpinfo,' .
                                                                     'escapeshellarg,escapeshellcmd';
   my $autoprepend         = $ibay->prop('PHPAutoPrependFile')  || 'enabled';
-
+  my $MailForceSender	  = $ibay->prop('MailForceSender')  || "$name\@$DomainName";
+												# TODO => check ibay associated domains.
   # Format vars 
   my $autoprep            = ( $autoprepend eq "disabled") ? "" : "/usr/share/php/auth_translation.php";
   my $autoprepath         = ( $autoprepend eq "disabled") ? "" : ",/usr/share/php/";
@@ -56,7 +57,7 @@
 php_admin_value[opcache.file_cache]  = /var/lib/php/$key/opcache
 php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp
 php_admin_value[sys_temp_dir] = /var/lib/php/$key/tmp
-php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
+php_admin_value[mail.force_extra_parameters]            = '-f $MailForceSender'
 php_admin_flag[display_errors] = off
 php_admin_flag[log_errors] = on
 php_admin_value[error_log] = /var/log/php/$key/error.log
diff -Nur --no-dereference smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings
--- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings	2021-03-06 23:17:38.963000000 -0500
+++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings	2021-03-06 23:47:08.862000000 -0500
@@ -1,4 +1,4 @@
-php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
+php_admin_value[mail.force_extra_parameters]            = '-f { "php\@$DomainName" }'
 php_admin_flag[display_errors] = off
 php_admin_flag[log_errors] = on
 php_admin_value[memory_limit] = { $MemoryLimit }
diff -Nur --no-dereference 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	2021-03-06 23:17:38.967000000 -0500
+++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings02mailfunction	2021-03-06 23:46:10.186000000 -0500
@@ -1,8 +1,10 @@
 [mail function]
 SMTP                                   = localhost
 smtp_port                              = {($qpsmtpd{TCPPort} || '25')}
-sendmail_from                          = root@{$DomainName}
+; windows setting, but in case :
+sendmail_from                          = '{$phpcur->prop(MailForceSender)|| $php{'MailForceSender'} || "root\@$DomainName" }'
 sendmail_path                          = {($phpcur->prop(SendmailPath) || $php{"SendmailPath"} || '/usr/sbin/sendmail -t -i')}
+mail.force_extra_parameters 	       = '-f {$phpcur->prop(MailForceSender)|| $php{'MailForceSender'} || "root\@$DomainName" }'
 mail.log                               = { 
 	my $mailog = $phpcur->prop(MailLog) || $php{"MailLog"} || "disabled";
 	my $mlog = ($mailog eq "enabled")? "/var/log/php/php$PHP_VERSION/mail.log" : "";