Index: trunk/admin/install/upgrades/changelog_1_1_5.txt
===================================================================
diff -u -r3498 -r3520
--- trunk/admin/install/upgrades/changelog_1_1_5.txt	(.../changelog_1_1_5.txt)	(revision 3498)
+++ trunk/admin/install/upgrades/changelog_1_1_5.txt	(.../changelog_1_1_5.txt)	(revision 3520)
@@ -8,11 +8,15 @@
 File in-portal/admin/listview/listview.php changed
 File in-portal/kernel/action.php changed
 File in-portal/kernel/admin/include/help/configure_general.txt changed
+File in-portal/kernel/include/emailmessage.php changed
 File in-portal/kernel/include/image.php changed
 File in-portal/kernel/include/itemreview.php changed
 File in-portal/kernel/include/parseditem.php changed
 File in-portal/kernel/include/relationship.php changed
+File in-portal/kernel/include/smtp.php changed
+File in-portal/kernel/include/usersession.php changed
 File in-portal/kernel/units/categories/categories_event_handler.php changed
+File in-portal/kernel/units/general/inp_ses_storage.php changed
 File in-portal/kernel/units/users/users_event_handler.php changed
 File in-portal/themes/inlink2/access_denied.tpl is removed
 File in-portal/themes/inlink2/add_link.tpl is removed
@@ -202,6 +206,9 @@
 File kernel4_dev/kernel4/parser/tags.php changed
 File kernel4_dev/kernel4/processors/main_processor.php changed
 File kernel4_dev/kernel4/session/session.php changed
+File kernel4_dev/kernel4/utility/email.php changed
+File kernel4_dev/kernel4/utility/formatters.php changed
+File cmseditor/fckconfig.js changed
 
 
 Changes in phrases and events:
Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r3516 -r3520
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 3516)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 3520)
@@ -758,6 +758,7 @@
 				return mail($To,trim($Subject),$Msg, $headers);
 			}
 
+    	$headers = "To: <".$To.">"."\n".$headers;
 			$headers = "Subject: ".trim($Subject)."\r\n".$headers;
 
 			$send_params['recipients']	= array($To);						// The recipients (can be multiple)
@@ -886,15 +887,6 @@
     	$boundary = "-----=".md5( uniqid (rand()));
     	$f = "\"$FromName\" <".$From.">";
     	$headers = "From: $f"."\n";
-    	if(strlen($ToName)>0)
-    	{
-    		$To = "\"$ToName\" <$ToAddr>";
-    	}
-    	else {
-    		$To = "<".$ToAddr.">";
-    	}
-
-    	$headers.="To: $To"."\n";
     	$headers .= "MIME-Version: 1.0"."\n";
 
     	$conn = &GetADODBConnection();