Index: t3lib/utility/class.t3lib_utility_mail.php =================================================================== --- t3lib/utility/class.t3lib_utility_mail.php (revision 7361) +++ t3lib/utility/class.t3lib_utility_mail.php (working copy) @@ -53,6 +53,15 @@ */ public static function mail($to, $subject, $messageBody, $additionalHeaders = null, $additionalParameters = null) { $success = TRUE; + + // If the mail does not have a From: header, fall back to the default in TYPO3_CONF_VARS. + if (!preg_match('/^From:/im', $additionalHeaders) && $GLOBALS['TYPO3_CONF_VARS']['SYS']['defaultMailFromAddress']) { + if (substr($additionalHeaders, -1) != LF) { + $additionalHeaders .= LF; + } + $additionalHeaders .= 'From: ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['defaultMailFromAddress']; + } + if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/utility/class.t3lib_utility_mail.php']['substituteMailDelivery'])) { $parameters = array( 'to' => $to,