diff -ru ./typo3.orig/branches/TYPO3_4-3/t3lib/class.t3lib_htmlmail.php ./typo3.new/branches/TYPO3_4-3/t3lib/class.t3lib_htmlmail.php --- ./typo3.orig/branches/TYPO3_4-3/t3lib/class.t3lib_htmlmail.php 2010-03-01 12:17:51.094021633 +0100 +++ ./typo3.new/branches/TYPO3_4-3/t3lib/class.t3lib_htmlmail.php 2010-03-01 13:28:16.250022078 +0100 @@ -725,8 +725,8 @@ // On windows the -f flag is not used (specific for Sendmail and Postfix), // but instead the php.ini parameter sendmail_from is used. - $returnPath = (strlen($this->returnPath) > 0) ? '-f ' . escapeshellarg($this->returnPath) : ''; - if($this->returnPath) { + $returnPath = ($this->forceReturnPath && strlen($this->returnPath) > 0) ? '-f ' . escapeshellarg($this->returnPath) : ''; + if (TYPO3_OS == 'WIN' && $this->returnPath) { @ini_set('sendmail_from', t3lib_div::normalizeMailAddress($this->returnPath)); } $recipient = t3lib_div::normalizeMailAddress($this->recipient);