better fix for bug #812690

class/deliver/Deliver_SendMail.class.php

@@ -24,6 +24,7 @@ class Deliver_SendMail extends Deliver {
         $rfc822_header = $message->rfc822_header;
 	$from = $rfc822_header->from[0];
 	$envelopefrom = trim($from->mailbox.'@'.$from->host);
+	$envelopefrom = str_replace(array("\0","\n"),array('',''),$envelopefrom);
 	if (strstr($sendmail_path, "qmail-inject")) {
     	    $stream = popen (escapeshellcmd("$sendmail_path -i -f$envelopefrom"), "w");
 	} else {