Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r199 -r200
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 199)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 200)
@@ -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;
@@ -813,9 +813,9 @@
 		if($HasFile)
 		{  			
 		  //Messages start with text/html alternatives in OB
-		   $headers.="Content-Type: multipart/mixed;\n\tboundary=\"".$OB."\"\r\n";
-           $msg ="This is a multi-part message in MIME format.\r\n";
-           $msg.="\r\n--".$OB."\r\n";
+		   $headers.='Content-Type: multipart/alternative; boundary="'.$this->textboundary.'"'."\n\n";
+           $msg ="This is a multi-part message in MIME format.\n\n";
+           $msg.="--".$OB."\n";
            $msg.="Content-Type: multipart/alternative; boundary=\"".$boundary."\"\r\n\r\n";		
 		}
 		else