diff --git a/lib/phpmailer/README_MOODLE.txt b/lib/phpmailer/README_MOODLE.txt
index c60713f4f05..a45eea5dc90 100644
--- a/lib/phpmailer/README_MOODLE.txt
+++ b/lib/phpmailer/README_MOODLE.txt
@@ -7,8 +7,17 @@ Moodle-specific changes to phpmailer are tracked here.
   Date: 14 Feb 2007
   Reason: http://tracker.moodle.org/browse/MDL-3681
 
+
   lib/phpmailer/class.phpmailer.php
 
   Changed by skodak
   Date 12 Mar 2007
-  Reason: support for gb18030
\ No newline at end of file
+  Reason: support for gb18030
+
+
+  lib/phpmailer/class.phpmailer.php
+
+  Changed by skodak
+  Date 15 Dec 2007
+  Reason: MDL-12596 - correct timezone in date
+  
\ No newline at end of file
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
index 6b2603563fa..8115b5d4749 100644
--- a/lib/phpmailer/class.phpmailer.php
+++ b/lib/phpmailer/class.phpmailer.php
@@ -1469,7 +1469,7 @@ class PHPMailer
         $tz = date("Z");
         $tzs = ($tz < 0) ? "-" : "+";
         $tz = abs($tz);
-        $tz = ($tz/3600)*100 + ($tz%3600)/60;
+        $tz = (($tz - ($tz%3600) )/3600)*100 + ($tz%3600)/60; // moodle change - MDL-12596
         $result = sprintf("%s %s%04d", date("D, j M Y H:i:s"), $tzs, $tz);
 
         return $result;