Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r216 -r217
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 216)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 217)
@@ -669,8 +669,8 @@
             //$headers = str_replace("\r\n","\n",$headers);
             //$headers = str_replace("\n","\r\n",$headers);
             
-            $headers = "Date: ".date("r")."\r\n".$headers;
-            $headers = "Return-Path: ".$objConfig->Get("Smtp_AdminMailFrom")."\r\n".$headers;
+            $headers = "Date: ".date("r")."\n".$headers;
+            $headers = "Return-Path: ".$objConfig->Get("Smtp_AdminMailFrom")."\n".$headers;
             //$Msg = str_replace("\r\n","\n",$Msg);
             //$Msg = str_replace("\n","\r\n",$Msg);
             
@@ -805,8 +805,8 @@
    		$OB="----=_OuterBoundary_000";
 		$boundary = "-----=".md5( uniqid (rand()));
 		$f = "\"$FromName\" <".$From.">";		
-		$headers = "From: $f\r\n";
-		$headers .= "MIME-Version: 1.0\r\n";
+		$headers = "From: $f\n";
+		$headers .= "MIME-Version: 1.0\n";
         
 		if($HasFile)
 		{