diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 68bb087e..4f516877 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -1160,10 +1160,11 @@ if ($modsForHesk_settings['request_location']) {
 
 // Set the message in the actual text box if rich text is enabled
 if ($modsForHesk_settings['rich_text_for_tickets']) {
+    $message = hesk_SESSION('as_message', '');
     echo "
     <script>
         tinymce.get('message').setContent('');
-        tinymce.get('message').execCommand('mceInsertRawHTML', false, '".$_SESSION['as_message']."');
+        tinymce.get('message').execCommand('mceInsertRawHTML', false, '".$message."');
     </script>
     ";
 }
diff --git a/calendar.php b/calendar.php
index 48091c89..80eec543 100644
--- a/calendar.php
+++ b/calendar.php
@@ -107,19 +107,23 @@ require_once(HESK_PATH . 'inc/header.inc.php');
 <div class="popover-template" style="display: none">
     <div>
         <div class="popover-location">
-            <strong>Location</strong>
+            <strong><?php echo $hesklang['event_location']; ?></strong>
             <span></span>
         </div>
         <div class="popover-category">
-            <strong>Category</strong>
+            <strong><?php echo $hesklang['category']; ?></strong>
             <span></span>
         </div>
         <div class="popover-from">
-            <strong>From</strong>
+            <strong><?php echo $hesklang['from']; ?></strong>
             <span></span>
         </div>
         <div class="popover-to">
-            <strong>To</strong>
+            <strong><?php echo $hesklang['to_title_case']; ?></strong>
+            <span></span>
+        </div>
+        <div class="popover-comments">
+            <strong><?php echo $hesklang['event_comments']; ?></strong>
             <span></span>
         </div>
     </div>
diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 3f1bed3b..f3c57fda 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -37,7 +37,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
 define('HESK_NEW_VERSION','2.6.7');
-define('MODS_FOR_HESK_NEW_VERSION','2.6.1');
+define('MODS_FOR_HESK_NEW_VERSION','2.6.2');
 define('REQUIRE_PHP_VERSION','5.0.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
 
diff --git a/install/mods-for-hesk/ajax/install-database-ajax.php b/install/mods-for-hesk/ajax/install-database-ajax.php
index 130a1016..4a39bd6e 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -62,6 +62,8 @@ if ($version == 2) {
     execute260Scripts();
 } elseif ($version == 28) {
     execute261Scripts();
+} elseif ($version == 29) {
+    execute262Scripts();
 } else {
     $response = 'The version "' . $version . '" was not recognized. Check the value submitted and try again.';
     print $response;
diff --git a/install/mods-for-hesk/installModsForHesk.php b/install/mods-for-hesk/installModsForHesk.php
index 41eb1218..76e3ec1b 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -37,6 +37,7 @@ $buildToVersionMap = array(
     26 => '2.5.5',
     27 => '2.6.0',
     28 => '2.6.1',
+    29 => '2.6.2',
 );
 
 function echoInitialVersionRows($version, $build_to_version_map)
diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js
index 9dfded88..ce2973b4 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -80,6 +80,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 28) {
         startVersionUpgrade('261');
         executeUpdate(28, '261', '2.6.1');
+    } else if (startingVersion < 29) {
+        startVersionUpgrade('262');
+        executeUpdate(29, '262', '2.6.2');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index 8cb5b658..fc26f38f 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -117,6 +117,7 @@ hesk_dbConnect();
                                     <div class="col-md-8">
                                         <select name="current-version" class="form-control">
                                             <optgroup label="Mods for HESK 2">
+                                                <option value="28">2.6.1</option>
                                                 <option value="27">2.6.0</option>
                                                 <option value="26">2.5.5</option>
                                                 <option value="25">2.5.4</option>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index f9fc213d..2db3ed34 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -795,6 +795,17 @@ function execute261Scripts() {
     updateVersion('2.6.1');
 }
 
+// Version 2.6.2
+function execute262Scripts() {
+    global $hesk_settings;
+    hesk_dbConnect();
+
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "stage_tickets` ADD COLUMN `due_date` DATETIME");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "stage_tickets` ADD COLUMN `overdue_email_sent` ENUM('0','1')");
+
+    updateVersion('2.6.2');
+}
+
 function execute270Scripts() {
     global $hesk_settings;
     hesk_dbConnect();
diff --git a/install/mods-for-hesk/sql/uninstallSql.php b/install/mods-for-hesk/sql/uninstallSql.php
index 572e62f3..5805d1a9 100644
--- a/install/mods-for-hesk/sql/uninstallSql.php
+++ b/install/mods-for-hesk/sql/uninstallSql.php
@@ -98,6 +98,8 @@ function removeOtherColumns()
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` DROP COLUMN `usage`");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `notify_overdue_unassigned`");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `default_calendar_view`");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "stage_tickets` DROP COLUMN `due_date`");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "stage_tickets` DROP COLUMN `overdue_email_sent`");
 
 
 
diff --git a/js/calendar/mods-for-hesk-calendar-readonly.js b/js/calendar/mods-for-hesk-calendar-readonly.js
index 0ca95b0a..b9aed385 100644
--- a/js/calendar/mods-for-hesk-calendar-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-readonly.js
@@ -52,7 +52,8 @@ $(document).ready(function() {
             $contents.find('.popover-category span').text(event.categoryName).end()
                 .find('.popover-location span').text(event.location).end()
                 .find('.popover-from span').text(event.start.format(format)).end()
-                .find('.popover-to span').text(endDate.format(format));
+                .find('.popover-to span').text(endDate.format(format)).end()
+                .find('.popover-comments span').text(event.comments);
             var $eventMarkup = $(this);
             $eventMarkup.popover({
                 title: event.title,
@@ -88,7 +89,7 @@ function buildEvent(id, dbObject) {
             type: dbObject.type,
             categoryId: dbObject.categoryId,
             className: 'category-' + dbObject.categoryId,
-            textColor: calculateTextColor(dbObject.categoryColor)
+            textColor: calculateTextColor(dbObject.categoryColor),
         };
     }