Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r201 -r202
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 201)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 202)
@@ -683,7 +683,7 @@
               
             if(!strlen($objConfig->Get("Smtp_Server")) || !$this->AllowSockets())
             {
-                return mail($To,trim($Subject),$Msg,"From: $From\r\n".$headers);
+                return mail($To, trim($Subject), $Msg, $headers);
             }
  
             $headers = "Subject: ".trim($Subject)."\r\n".$headers;
@@ -814,7 +814,6 @@
 		{  			
 		  //Messages start with text/html alternatives in OB
 		   $headers.="Content-Type: multipart/mixed;\n\tboundary=\"".$OB."\"\n\n";
-           $msg ="This is a multi-part message in MIME format.\r\n";
            $msg.="--".$OB."\n";
            $msg.="Content-Type: multipart/alternative; boundary=\"$boundary\"\n\n";		
 		}
@@ -827,7 +826,7 @@
                 $headers .= $extra_headers[$i]."\n";
             }
         }	   	
-        
+    $msg .="This is a multi-part message in MIME format.\r\n";
 		$msg .= "--" . $boundary . "\r\n";
 		$msg .= "Content-Type: text/plain; charset=\"$charset\"\r\n";
 		$msg .= "Content-Transfer-Encoding: 8bit\r\n\r\n";