Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r145 -r199
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 145)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 199)
@@ -665,9 +665,6 @@
         else
         {
             $this->MessagesSent++;
-            /* ensure headers are using \r\n instead of \n */
-            $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;
@@ -679,6 +676,11 @@
             $ver = phpversion();
             if(substr($Subject,0,9)=="Subject: ")
               $Subject = substr($Subject,9); 
+              
+            /* ensure headers are using \r\n instead of \n */
+            $headers = str_replace("\r\n","\n",$headers);
+            //$headers = str_replace("\n","\r\n",$headers);
+              
             if(!strlen($objConfig->Get("Smtp_Server")) || !$this->AllowSockets())
             {
                 return mail($To,trim($Subject),$Msg,"From: $From\r\n".$headers);