Index: CHANGELOG
===================================================================
--- CHANGELOG	(revision 9b3d7f743f21f0ae27bb314faa61e04f43411be0)
+++ CHANGELOG	(revision a22cb65adbde7e7b101d2c950b617eaec6f5c790)
@@ -1,4 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/10/07 (alec)
+----------
+- Write username instead of id in sendmail log (#1485477)
+- Fix htmlspecialchars() use for PHP version < 5.2.3 (#1485475)
+- Fix js keywords escaping in json_serialize() for IE/Opera (#1485472)
 
 2008/10/03 (alec)
Index: program/steps/mail/func.inc
===================================================================
--- program/steps/mail/func.inc	(revision a164a2e64b65fbe0729f6d4326b0219f1914c139)
+++ program/steps/mail/func.inc	(revision a22cb65adbde7e7b101d2c950b617eaec6f5c790)
@@ -1155,5 +1155,5 @@
 function rcmail_deliver_message(&$message, $from, $mailto)
 {
-  global $CONFIG;
+  global $CONFIG, $RCMAIL;
 
   $msg_body = $message->get();
@@ -1211,7 +1211,7 @@
     
     if ($CONFIG['smtp_log'])
-      write_log('sendmail', sprintf("[%s] User: %d on %s; Message for %s; %s",
+      write_log('sendmail', sprintf("[%s] User: %s on %s; Message for %s; %s",
 		date("d-M-Y H:i:s O", mktime()),
-		$_SESSION['user_id'],
+		$RCMAIL->user->get_username(),
 		$_SERVER['REMOTE_ADDR'],
 		$mailto,