diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
index b8e0f8eb..c4b11321 100644
--- a/admin/admin_reply_ticket.php
+++ b/admin/admin_reply_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -251,8 +251,8 @@ $info = array(
 'subject'		=> $ticket['subject'],
 'message'		=> stripslashes($message),
 'attachments'	=> $myattachments,
-'dt'			=> hesk_date($ticket['dt']),
-'lastchange'	=> hesk_date($ticket['lastchange']),
+'dt'			=> hesk_date($ticket['dt'], true),
+'lastchange'	=> hesk_date($ticket['lastchange'], true),
 );
 
 // 2. Add custom fields to the array
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 8543c9cc..1bf456ff 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -261,8 +261,8 @@ if (isset($_POST['notemsg']) && hesk_token_check('POST'))
 				'lastreplier'	=> $ticket['lastreplier'],
 				'subject'		=> $ticket['subject'],
 				'message'		=> stripslashes($msg),
-                'dt'            => hesk_date($ticket['dt']),
-                'lastchange'    => hesk_date($ticket['lastchange']),
+                'dt'            => hesk_date($ticket['dt'], true),
+                'lastchange'    => hesk_date($ticket['lastchange'], true),
 				);
 
 				// 2. Add custom fields to the array
@@ -443,11 +443,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 </li>
                 <li class="list-group-item">
                     <strong><?php echo $hesklang['created_on']; ?></strong><br/>
-                    <?php echo hesk_date($ticket['dt']); ?>
+                    <?php echo hesk_date($ticket['dt'], true); ?>
                 </li>
                 <li class="list-group-item">
                     <strong><?php echo $hesklang['last_update']; ?></strong><br/>
-                    <?php echo hesk_date($ticket['lastchange']); ?>    
+                    <?php echo hesk_date($ticket['lastchange'], true); ?>    
                 </li>
                 <li class="list-group-item">
                     <strong><?php echo $hesklang['last_replier']; ?></strong><br/>
@@ -773,7 +773,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     <?php echo hesk_getAdminButtonsInTicket(0, $i); ?>
                     
                     <!-- Date -->
-                    <p><br/><?php echo $hesklang['date']; ?>: <?php echo hesk_date($ticket['dt']); ?>
+                    <p><br/><?php echo $hesklang['date']; ?>: <?php echo hesk_date($ticket['dt'], true); ?>
                     
                     <!-- Custom Fields Before Message -->
                         <?php
@@ -1100,7 +1100,7 @@ function hesk_printTicketReplies() {
 	{
 		$color = 'class="ticketMessageContainer"';
 
-		$reply['dt'] = hesk_date($reply['dt']);
+		$reply['dt'] = hesk_date($reply['dt'], true);
 		?>
         <div class="row ticketMessageContainer">
             <div class="col-md-3 col-xs-12">
diff --git a/admin/export.php b/admin/export.php
index 3644aac6..f497428a 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -523,16 +523,17 @@ if (isset($_GET['w']))
 		$ticket['message'] = hesk_msgToPlain($ticket['message'], 1);
         $ticket['subject'] = hesk_msgToPlain($ticket['subject'], 1);
         $ticket['owner'] = isset($admins[$ticket['owner']]) ? $admins[$ticket['owner']] : '';
-        $ticket['dt'] = date("Y-m-d\TH:i:s\.000", strtotime($ticket['dt']));
-        $ticket['lastchange'] = date("Y-m-d\TH:i:s\.000", strtotime($ticket['lastchange']));
+        
+        // Format for export dates
+        $hesk_settings['timeformat'] = "Y-m-d\TH:i:s\.000";
 
 		// Create row for the XML file
 		$tmp .= '
 <Row>
 <Cell><Data ss:Type="Number">'.$ticket['id'].'</Data></Cell>
 <Cell><Data ss:Type="String"><![CDATA['.$ticket['trackid'].']]></Data></Cell>
-<Cell ss:StyleID="s62"><Data ss:Type="DateTime">'.$ticket['dt'].'</Data></Cell>
-<Cell ss:StyleID="s62"><Data ss:Type="DateTime">'.$ticket['lastchange'].'</Data></Cell>
+<Cell ss:StyleID="s62"><Data ss:Type="DateTime">'.hesk_date($ticket['dt'], true).'</Data></Cell>
+<Cell ss:StyleID="s62"><Data ss:Type="DateTime">'.hesk_date($ticket['lastchange'], true).'</Data></Cell>
 <Cell><Data ss:Type="String"><![CDATA['.hesk_msgToPlain($ticket['name'], 1).']]></Data></Cell>
 <Cell><Data ss:Type="String"><![CDATA['.$ticket['email'].']]></Data></Cell>
 <Cell><Data ss:Type="String"><![CDATA['.$my_cat[$ticket['category']].']]></Data></Cell>
@@ -567,6 +568,9 @@ if (isset($_GET['w']))
         $tickets_exported++;
         $this_round++;
 	} // End of while loop
+    
+    // Go back to the HH:MM:SS format for hesk_date()
+    $hesk_settings['timeformat'] = 'H:i:s';
 
 	// Append any remaining rows into the file
 	if ($this_round > 0)
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index 897c729e..24d23267 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -282,7 +282,7 @@ function hesk_show_kb_article($artid)
     </tr>
     <tr>
     <td><?php echo $hesklang['dta']; ?>: </td>
-    <td><?php echo hesk_date($article['dt']); ?></td>
+    <td><?php echo hesk_date($article['dt'], true); ?></td>
     </tr>
     <tr>
     <td><?php echo $hesklang['views']; ?>: </td>
diff --git a/admin/mail.php b/admin/mail.php
index 123a8b7f..1630580f 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -428,7 +428,10 @@ function show_message()
 	        }
 
 	        $pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? '<a href="mail.php?a=new&amp;id='.$pm[$hesk_settings['mailtmp']['other']].'">'.$admins[$pm[$hesk_settings['mailtmp']['other']]].'</a>' : (($pm['from'] == 9999) ? '<a href="http://www.hesk.com" target="_blank">HESK.com</a>' : $hesklang['e_udel']);
-	        $pm['dt'] = hesk_dateToString($pm['dt'],0,1);
+	        
+            echo $pm['dt'];
+            
+            $pm['dt'] = hesk_dateToString($pm['dt'],0,1,0,true);
 			?>
 
             <table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -597,7 +600,7 @@ function mail_list_messages()
 		    	$pm['subject'] = '<b>'.$pm['subject'].'</b>';
 		    }
 			$pm['name'] = isset($admins[$pm[$hesk_settings['mailtmp']['other']]]) ? '<a href="mail.php?a=new&amp;id='.$pm[$hesk_settings['mailtmp']['other']].'">'.$admins[$pm[$hesk_settings['mailtmp']['other']]].'</a>' : (($pm['from'] == 9999) ? '<a href="http://www.hesk.com" target="_blank">HESK.com</a>' : $hesklang['e_udel']);
-		    $pm['dt'] = hesk_dateToString($pm['dt'],0);
+		    $pm['dt'] = hesk_dateToString($pm['dt'],0,0,0,true);
 
 			echo <<<EOC
 			<tr>
diff --git a/admin/profile.php b/admin/profile.php
index c7fe5391..1971b542 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -155,7 +155,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
 	?>
         <script language="javascript" type="text/javascript">
-		document.write('<?php echo str_replace(array('"','<','=','>'),array('\42','\74','\75','\76'),$str . '</form>'); ?>');
+		document.write('<?php echo str_replace(array('"','<','=','>',"'"),array('\42','\74','\75','\76','\47'),$str . '</form>'); ?>');
         </script>
         <noscript>
         <?php
diff --git a/inc/common.inc.php b/inc/common.inc.php
index dcfd87c8..c551d9d2 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -936,7 +936,7 @@ function hesk_getLanguagesAsFormIfNecessary()
 
         ?>
         <script language="javascript" type="text/javascript">
-            document.write('<?php echo str_replace(array('"','<','=','>'),array('\42','\74','\75','\76'),$str . '</form>'); ?>');
+            document.write('<?php echo str_replace(array('"','<','=','>',"'"),array('\42','\74','\75','\76','\47'),$str . '</form>'); ?>');
         </script>
         <noscript>
             <?php
@@ -1076,7 +1076,7 @@ function hesk_returnLanguage()
 } // END hesk_returnLanguage()
 
 
-function hesk_date($dt='')
+function hesk_date($dt='', $from_database=false)
 {
 	global $hesk_settings;
 
@@ -1089,14 +1089,32 @@ function hesk_date($dt='')
     	$dt = strtotime($dt);
     }
 
+    // Adjust MySQL time if different from PHP time
+	if ($from_database)
+	{
+		if ( ! defined('MYSQL_TIME_DIFF') )
+		{
+			define('MYSQL_TIME_DIFF', time()-hesk_dbTime() );
+		}
+
+		if (MYSQL_TIME_DIFF != 0)
+		{
+			$dt += MYSQL_TIME_DIFF;
+		}
+	}
+
+	// Add HESK set time difference
 	$dt += 3600*$hesk_settings['diff_hours'] + 60*$hesk_settings['diff_minutes'];
 
+    // Daylight savings?
     if ($hesk_settings['daylight'] && date('I', $dt))
     {
 		$dt += 3600;
 	}
 
+    // Return formatted date
 	return date($hesk_settings['timeformat'], $dt);
+    
 } // End hesk_date()
 
 
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 3b873dd4..c7786a3c 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -76,7 +76,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 	if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg'])
 	{
 		?>
-		<script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/3.5.10/tiny_mce.js"></script>
+		<script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/3.5.11/tiny_mce.js"></script>
 		<?php
 	}
 
diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php
index 98645889..81b8f051 100644
--- a/inc/knowledgebase_functions.inc.php
+++ b/inc/knowledgebase_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -256,7 +256,7 @@ function hesk_kbLatestArticles($how_many, $index = 1)
 
 		if ($hesk_settings['kb_date'])
 		{
-			echo '<td valign="top" style="text-align:right" width="200">' . hesk_date($article['dt']) . '</td>';
+			echo '<td valign="top" style="text-align:right" width="200">' . hesk_date($article['dt'], true) . '</td>';
 		}
 
 		echo '
diff --git a/install/updateNuMods.php b/install/updateNuMods.php
index b8251cd1..5163e852 100644
--- a/install/updateNuMods.php
+++ b/install/updateNuMods.php
@@ -61,11 +61,11 @@ if ($_GET['update'] == 1)
 ?>
 <html>
     <head>
-        <title>NuMods 1.2.0 Install / Upgrade</title>
+        <title>NuMods 1.2.4 Install / Upgrade</title>
     </head>
     <body>
         <div style="display: <?php echo $showInstructions; ?>">
-        <h1>Install / Upgrade NuMods to 1.2.0</h1>
+        <h1>Install / Upgrade NuMods to 1.2.4</h1>
         <h4><i>If you have not yet installed/updated HESK, please do so first before continuing; otherwise installation will <b>fail</b>!</i></h4>
         <br/>
         <p>Please verify the database information below.  Addtionally, ensure that the database user has CREATE permissions.</p>
diff --git a/knowledgebase.php b/knowledgebase.php
index 70aa932d..8ab5292f 100644
--- a/knowledgebase.php
+++ b/knowledgebase.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -323,7 +323,7 @@ function hesk_show_kb_article($artid)
         if ($hesk_settings['kb_date'])
         {
         ?>
-        <p><?php echo $hesklang['dta']; ?>: <?php echo hesk_date($article['dt']); ?></p>
+        <p><?php echo $hesklang['dta']; ?>: <?php echo hesk_date($article['dt'], true); ?></p>
         <?php
         }
 
diff --git a/nuMods_settings.inc.php b/nuMods_settings.inc.php
index 515b16d6..4a20313d 100644
--- a/nuMods_settings.inc.php
+++ b/nuMods_settings.inc.php
@@ -14,4 +14,4 @@ $nuMods_settings['dropdownItemTextHoverBackgroundColor'] = '#f5f5f5';
 $nuMods_settings['questionMarkColor'] = '#000000';
 
 /* DO NOT EDIT ANYTHING BELOW THIS LINE */
-$nuMods_settings['version']='1.2.3';
+$nuMods_settings['version']='1.2.4';
diff --git a/print.php b/print.php
index b4b69133..51ea7404 100644
--- a/print.php
+++ b/print.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -148,8 +148,8 @@ else
 }
 
 /* Other variables that need processing */
-$ticket['dt'] = hesk_date($ticket['dt']);
-$ticket['lastchange'] = hesk_date($ticket['lastchange']);
+$ticket['dt'] = hesk_date($ticket['dt'], true);
+$ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
 $random=mt_rand(10000,99999);
 
 // Print ticket head
@@ -228,7 +228,7 @@ echo '<p>' . hesk_unhortenUrl($ticket['message']) . '</p>';
 // Print replies
 while ($reply = hesk_dbFetchAssoc($res))
 {
-	$reply['dt'] = hesk_date($reply['dt']);
+	$reply['dt'] = hesk_date($reply['dt'], true);
 
     echo '
     <hr />
diff --git a/reply_ticket.php b/reply_ticket.php
index be9a2bc1..7c09275c 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -192,8 +192,8 @@ $info = array(
 'subject'		=> $ticket['subject'],
 'message'		=> stripslashes($message),
 'attachments'	=> $myattachments,
-'dt'			=> hesk_date($ticket['dt']),
-'lastchange'	=> hesk_date($ticket['lastchange']),
+'dt'			=> hesk_date($ticket['dt'], true),
+'lastchange'	=> hesk_date($ticket['lastchange'], true),
 );
 
 // 2. Add custom fields to the array
diff --git a/ticket.php b/ticket.php
index 12effbfc..671b4774 100644
--- a/ticket.php
+++ b/ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.5.3 from 16th March 2014
+*  Version: 2.5.5 from 5th August 2014
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
@@ -267,7 +267,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                 </tr>
                 <tr>
                     <td colspan="10" style="border-width: 0px">
-                        <p><?php echo $hesklang['created_on']; ?>: <?php echo hesk_date($ticket['dt']); ?>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $hesklang['last_update']; ?>: <?php echo hesk_date($ticket['lastchange']); ?></p>
+                        <p><?php echo $hesklang['created_on']; ?>: <?php echo hesk_date($ticket['dt'], true); ?>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $hesklang['last_update']; ?>: <?php echo hesk_date($ticket['lastchange'], true); ?></p>
                     </td>
                     <td colspan="10" style="border-width: 0px; text-align: right;">
                         <p><?php $random=rand(10000,99999);
@@ -335,7 +335,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                 <div class="col-md-9 col-xs-12 pushMarginLeft">
                     <div class="ticketMessageTop withBorder">
                             <!-- Date and Action buttons -->
-                            <p><?php echo $hesklang['date']; ?>: <?php echo hesk_date($ticket['dt']); ?><span style="float: right"><?php echo hesk_getCustomerButtons($i); ?></span></p>
+                            <p><?php echo $hesklang['date']; ?>: <?php echo hesk_date($ticket['dt'], true); ?><span style="float: right"><?php echo hesk_getCustomerButtons($i); ?></span></p>
                             <!-- Custom Fields Before Message -->
                             <?php
                                 foreach ($hesk_settings['custom_fields'] as $k=>$v)
@@ -598,7 +598,7 @@ function hesk_printCustomerTicketReplies()
 			$unread_replies[] = $reply['id'];
 		}
 
-		$reply['dt'] = hesk_date($reply['dt']);
+		$reply['dt'] = hesk_date($reply['dt'], true);
 		?>
 
         <div class="row ticketMessageContainer">