diff -ru typo3_src-4.1.2.orig/t3lib/class.t3lib_formmail.php typo3_src-4.1.2/t3lib/class.t3lib_formmail.php --- typo3_src-4.1.2.orig/t3lib/class.t3lib_formmail.php Fri Aug 10 12:09:11 2007 +++ typo3_src-4.1.2/t3lib/class.t3lib_formmail.php Fri Aug 10 12:09:30 2007 @@ -117,7 +117,7 @@ $this->from_name = ($convCharset && strlen($val)) ? $GLOBALS['TSFE']->csConvObj->conv($val,$GLOBALS['TSFE']->renderCharset,$this->charset) : $val; $this->from_name = $this->sanitizeHeaderString($this->from_name); $this->from_name = preg_match( '/\s|,/', $this->from_name ) >= 1 ? '"'.$this->from_name.'"' : $this->from_name; - $val = ($V['replyto_name']) ? $V['replyto_name'] : $this->from_name; + $val = ($V['replyto_name']) ? $V['replyto_name'] : ($V['from_name']) ? $V['from_name'] : (($V['name'])?$V['name']:''); $this->replyto_name = ($convCharset && strlen($val)) ? $GLOBALS['TSFE']->csConvObj->conv($val,$GLOBALS['TSFE']->renderCharset,$this->charset) : $val; $this->replyto_name = $this->sanitizeHeaderString($this->replyto_name); $this->replyto_name = preg_match( '/\s|,/', $this->replyto_name ) > 1 ? '"'.$this->replyto_name.'"' : $this->replyto_name;