Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r1221 -r1384
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 1221)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 1384)
@@ -735,12 +735,12 @@
 
             $headers = str_replace("\n\n","\r\n\r\n",$headers);
             $headers = str_replace("\r\n","\n",$headers);
-            $headers = str_replace("\n","\r\n",$headers);
+            //$headers = str_replace("\n","\r\n",$headers);
             
            // if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
             	$Msg = str_replace("\n\n","\r\n\r\n",$Msg);
             	$Msg = str_replace("\r\n","\n",$Msg);
-            	$Msg = str_replace("\n","\r\n",$Msg);
+            	//$Msg = str_replace("\n","\r\n",$Msg);
            // }
             
             //echo "<PRE>"; print_r(htmlentities($headers)); echo "</PRE>";