Index: t3lib/utility/class.t3lib_utility_mail.php
===================================================================
--- t3lib/utility/class.t3lib_utility_mail.php	(revision 9643)
+++ t3lib/utility/class.t3lib_utility_mail.php	(working copy)
@@ -66,7 +66,16 @@
 				$success = $success && t3lib_div::callUserFunction($hookMethod, $parameters, $fakeThis);
 			}
 		} else {
-			$success = @mail($to, $subject, $messageBody, $additionalHeaders, $additionalParameters);
+			if (t3lib_utility_PhpOptions::isSafeModeEnabled() && !empty($additionalParameters)) {
+				t3lib_div::sysLog('Additional parameters to sendmail are not allowed if PHP safe mode is on.', 'Core', 2);
+				$additionalParameters = null;
+			}
+
+			if (empty($additionalParameters)) {
+				$success = @mail($to, $subject, $messageBody, $additionalHeaders);
+			} else {
+				$success = @mail($to, $subject, $messageBody, $additionalHeaders, $additionalParameters);
+			}
 		}
 
 		if (!$success) {