diff --git a/admin/admin_main.php b/admin/admin_main.php
index 51711d66..8a6a4141 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
index 5eb0b74b..f96dbf32 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.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index cd2a5a88..df878b5f 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 8ba50030..f4c60698 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index a1780d5f..8e008528 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 54c11ac2..c98471ab 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/banned_emails.php b/admin/banned_emails.php
index 4e04f56e..07efc651 100644
--- a/admin/banned_emails.php
+++ b/admin/banned_emails.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/banned_ips.php b/admin/banned_ips.php
index 601c58d5..4a04d1b2 100644
--- a/admin/banned_ips.php
+++ b/admin/banned_ips.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/change_status.php b/admin/change_status.php
index e408a0a7..adf471d8 100644
--- a/admin/change_status.php
+++ b/admin/change_status.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/delete_tickets.php b/admin/delete_tickets.php
index 0045317e..e71caee9 100644
--- a/admin/delete_tickets.php
+++ b/admin/delete_tickets.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/edit_note.php b/admin/edit_note.php
index b54d11f5..de66169a 100644
--- a/admin/edit_note.php
+++ b/admin/edit_note.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/edit_post.php b/admin/edit_post.php
index dfccb7bd..bac0d15f 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/export.php b/admin/export.php
index 09596fa4..6470736c 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/find_tickets.php b/admin/find_tickets.php
index 022c69bf..d346e8b3 100644
--- a/admin/find_tickets.php
+++ b/admin/find_tickets.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/index.php b/admin/index.php
index 47f3267d..a4adca3e 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index fb3319a2..c6f1f4d8 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.5 from 28th August 2015
+*  Version: 2.6.7 from 18th April 2016
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/lock.php b/admin/lock.php
index e88dc9ae..d1f58187 100644
--- a/admin/lock.php
+++ b/admin/lock.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/mail.php b/admin/mail.php
index f46d8151..2f8df755 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -476,7 +476,7 @@ function mail_list_messages()
 
     $maxresults = 30;
 
-    $tmp = intval(hesk_POST('page', 1));
+    $tmp = intval(hesk_GET('page', 1));
     $page = ($tmp > 1) ? $tmp : 1;
 
     /* List of private messages */
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index f8709baf..b96ee0e9 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 515b412e..47f20785 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index 250e4ba2..23f2c1e8 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.6 from 2nd February 2016
+*  Version: 2.6.7 from 18th April 2016
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php
index bbdd2fc7..a802152c 100644
--- a/admin/manage_permission_templates.php
+++ b/admin/manage_permission_templates.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index 25a87cfd..df959bec 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/manage_users.php b/admin/manage_users.php
index 09a45972..cf71bbc1 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 969e7085..bc76f71b 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/options.php b/admin/options.php
index 4521dfce..916a701a 100644
--- a/admin/options.php
+++ b/admin/options.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/password.php b/admin/password.php
index 89abc857..18b26a2a 100644
--- a/admin/password.php
+++ b/admin/password.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/profile.php b/admin/profile.php
index a1d78041..c63576a4 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/reports.php b/admin/reports.php
index 3eb49f11..c69568bc 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/service_messages.php b/admin/service_messages.php
index 3de93140..1524adf6 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/admin/show_tickets.php b/admin/show_tickets.php
index 079ecc3e..a6d6697f 100644
--- a/admin/show_tickets.php
+++ b/admin/show_tickets.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/change_status.php b/change_status.php
index 74fc11bd..9026d723 100644
--- a/change_status.php
+++ b/change_status.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -137,7 +137,7 @@ if (hesk_dbAffectedRows() != 1) {
 
 // Show success message
 if ($status != $closedStatus) {
-    hesk_process_messages($hesklang['wrepo'], 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999), 'NOTICE');
+    hesk_process_messages($hesklang['wrepo'],'ticket.php','NOTICE');
 } else {
-    hesk_process_messages($hesklang['your_ticket_been'] . ' ' . $action, 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999), 'SUCCESS');
+    hesk_process_messages($hesklang['your_ticket_been'].' '.$action,'ticket.php','SUCCESS');
 }
diff --git a/download_attachment.php b/download_attachment.php
index ec265e4d..a7a2234c 100755
--- a/download_attachment.php
+++ b/download_attachment.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/hesk_javascript.js b/hesk_javascript.js
index 2ffdbd56..fbbd83fc 100644
--- a/hesk_javascript.js
+++ b/hesk_javascript.js
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/admin_functions.inc.php b/inc/admin_functions.inc.php
index ecda310c..85554d36 100644
--- a/inc/admin_functions.inc.php
+++ b/inc/admin_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/attachments.inc.php b/inc/attachments.inc.php
index afe20566..765e3ee2 100644
--- a/inc/attachments.inc.php
+++ b/inc/attachments.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/common.inc.php b/inc/common.inc.php
index 54d53595..0b285dd3 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -166,6 +166,11 @@ function hesk_utf8_urldecode($in)
     return hesk_html_entity_decode($in);
 } // END hesk_utf8_urldecode
 
+function hesk_SESSION($in, $default = '')
+{
+    return isset($_SESSION[$in]) && ! is_array($_SESSION[$in]) ? $_SESSION[$in] : $default;
+} // END hesk_SESSION();
+
 
 function hesk_COOKIE($in, $default = '')
 {
@@ -243,6 +248,7 @@ function hesk_verifyEmailMatch($trackingID, $my_email = 0, $ticket_email = 0, $e
     if (!$hesk_settings['email_view_ticket']) {
         $hesk_settings['e_param'] = '';
         $hesk_settings['e_query'] = '';
+        $hesk_settings['e_email'] = '';
         return true;
     }
 
@@ -253,6 +259,7 @@ function hesk_verifyEmailMatch($trackingID, $my_email = 0, $ticket_email = 0, $e
     if ($my_email) {
         $hesk_settings['e_param'] = '&e=' . rawurlencode($my_email);
         $hesk_settings['e_query'] = '&amp;e=' . rawurlencode($my_email);
+        $hesk_settings['e_email'] = $my_email;
     } else {
         $my_email = hesk_getCustomerEmail();
     }
@@ -292,7 +299,7 @@ function hesk_verifyEmailMatch($trackingID, $my_email = 0, $ticket_email = 0, $e
 } // END hesk_verifyEmailMatch()
 
 
-function hesk_getCustomerEmail($can_remember = 0)
+function hesk_getCustomerEmail($can_remember = 0, $field = '')
 {
     global $hesk_settings, $hesklang;
 
@@ -300,6 +307,7 @@ function hesk_getCustomerEmail($can_remember = 0)
     if (!$hesk_settings['email_view_ticket']) {
         $hesk_settings['e_param'] = '';
         $hesk_settings['e_query'] = '';
+        $hesk_settings['e_email'] = '';
         return '';
     }
 
@@ -310,11 +318,17 @@ function hesk_getCustomerEmail($can_remember = 0)
 
     $my_email = '';
 
+    /* Is email in session? */
+    if ( strlen($field) && isset($_SESSION[$field]) )
+    {
+        $my_email = hesk_validateEmail($_SESSION[$field], 'ERR', 0);
+    }
+
     /* Is email in query string? */
     if (isset($_GET['e']) || isset($_POST['e'])) {
         $my_email = hesk_validateEmail(hesk_REQUEST('e'), 'ERR', 0);
     } /* Is email in cookie? */
-    elseif (isset($_COOKIE['hesk_myemail'])) {
+    elseif ( isset($_GET['e']) || isset($_POST['e']) ) {
         $my_email = hesk_validateEmail(hesk_COOKIE('hesk_myemail'), 'ERR', 0);
         if ($can_remember && $my_email) {
             $do_remember = ' checked="checked" ';
@@ -323,6 +337,7 @@ function hesk_getCustomerEmail($can_remember = 0)
 
     $hesk_settings['e_param'] = '&e=' . rawurlencode($my_email);
     $hesk_settings['e_query'] = '&amp;e=' . rawurlencode($my_email);
+    $hesk_settings['e_email'] = $my_email;
 
     return $my_email;
 
@@ -412,7 +427,9 @@ function hesk_autoAssignTicket($ticket_category)
 
 function hesk_cleanID($field = 'track')
 {
-    if (isset($_GET[$field]) && !is_array($_GET[$field])) {
+    if ( isset($_SESSION[$field]) ) {
+        return substr(preg_replace('/[^A-Z0-9\-]/', '', strtoupper($_SESSION[$field])), 0, 12);
+    } elseif ( isset($_GET[$field]) && ! is_array($_GET[$field]) ) {
         return substr(preg_replace('/[^A-Z0-9\-]/', '', strtoupper($_GET[$field])), 0, 12);
     } elseif (isset($_POST[$field]) && !is_array($_POST[$field])) {
         return substr(preg_replace('/[^A-Z0-9\-]/', '', strtoupper($_POST[$field])), 0, 12);
diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php
index 74f94f0d..d71afae7 100644
--- a/inc/email_functions.inc.php
+++ b/inc/email_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/header.inc.php b/inc/header.inc.php
index d530a0cf..43b91a58 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 11f74bf0..47a034ec 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php
index d7a50048..2d935fa7 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.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/pipe_functions.inc.php b/inc/pipe_functions.inc.php
index 85602966..6899ba60 100755
--- a/inc/pipe_functions.inc.php
+++ b/inc/pipe_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/posting_functions.inc.php b/inc/posting_functions.inc.php
index 5d60a891..9dcd7781 100644
--- a/inc/posting_functions.inc.php
+++ b/inc/posting_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/print_tickets.inc.php b/inc/print_tickets.inc.php
index 26161f9e..e1163823 100644
--- a/inc/print_tickets.inc.php
+++ b/inc/print_tickets.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/profile_functions.inc.php b/inc/profile_functions.inc.php
index d6258800..9afd1724 100644
--- a/inc/profile_functions.inc.php
+++ b/inc/profile_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index b4acd79d..5487474f 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php
index a287a998..9bb98565 100644
--- a/inc/show_search_form.inc.php
+++ b/inc/show_search_form.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/status_functions.inc.php b/inc/status_functions.inc.php
index b55cf158..d2848d8e 100644
--- a/inc/status_functions.inc.php
+++ b/inc/status_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php
index ed1a27df..ffce162c 100644
--- a/inc/ticket_list.inc.php
+++ b/inc/ticket_list.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/index.php b/index.php
index cb25d6b3..7224118a 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/install/install.php b/install/install.php
index 439916e7..e1d186e2 100644
--- a/install/install.php
+++ b/install/install.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.5 from 28th August 2015
+*  Version: 2.6.7 from 18th April 2016
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 02c357f3..ef35daa5 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
 *  Title: Help Desk Software HESK
-*  Version: 2.6.5 from 28th August 2015
+*  Version: 2.6.7 from 18th April 2016
 *  Author: Klemen Stirn
 *  Website: http://www.hesk.com
 ********************************************************************************
diff --git a/knowledgebase.php b/knowledgebase.php
index 0b735d1c..c8fd3ebc 100644
--- a/knowledgebase.php
+++ b/knowledgebase.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/print.php b/print.php
index 49d6ecb7..adca0a00 100644
--- a/print.php
+++ b/print.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -38,9 +38,19 @@ hesk_load_database_functions();
 
 hesk_session_start();
 
+// Do we have parameters in query string? If yes, store them in session and redirect
+if ( isset($_GET['track']) || isset($_GET['e']) )
+{
+    $_SESSION['p_track'] = hesk_GET('track');
+    $_SESSION['p_email'] = hesk_GET('e');
+
+    header('Location: print.php');
+    die();
+}
+
 
 /* Get the tracking ID */
-$trackingID = hesk_cleanID() or die("$hesklang[int_error]: $hesklang[no_trackID]");
+$trackingID = hesk_cleanID('p_track') or die("$hesklang[int_error]: $hesklang[no_trackID]");
 
 /* Connect to database */
 hesk_dbConnect();
@@ -52,8 +62,13 @@ if (empty($_SESSION['id'])) {
 
     // Verify email address match
     hesk_verifyEmailMatch($trackingID);
+    $my_email = hesk_getCustomerEmail(0, 'p_email');
+    hesk_verifyEmailMatch($trackingID, $my_email);
 }
 
+/* Clean ticket parameters from the session data, we don't need them anymore */
+hesk_cleanSessionVars( array('p_track', 'p_email') );
+
 /* Get ticket info */
 $res = hesk_dbQuery("SELECT `t1`.* , `ticketStatus`.`IsClosed` AS `isClosed`, `ticketStatus`.`Key` AS `statusKey`, `t2`.name AS `repliername`
 					FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `t1` LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `t2` ON `t1`.`replierid` = `t2`.`id`
diff --git a/reply_ticket.php b/reply_ticket.php
index 3342e05e..bcacfb73 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -70,6 +70,10 @@ $trackingID = hesk_cleanID('orig_track') or die($hesklang['int_error'] . ': No o
 // Email required to view ticket?
 $my_email = hesk_getCustomerEmail();
 
+// Setup required session vars
+$_SESSION['t_track'] = $trackingID;
+$_SESSION['t_email'] = $my_email;
+
 // Get message
 $message = hesk_input(hesk_POST('message'));
 
@@ -118,7 +122,7 @@ if (count($hesk_error_buffer) != 0) {
     $hesk_error_buffer = $tmp;
 
     $hesk_error_buffer = $hesklang['pcer'] . '<br /><br /><ul>' . $hesk_error_buffer . '</ul>';
-    hesk_process_messages($hesk_error_buffer, 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999));
+    hesk_process_messages($hesk_error_buffer,'ticket.php');
 }
 
 // Check if this IP is temporarily locked out
@@ -142,7 +146,7 @@ hesk_verifyEmailMatch($trackingID, $my_email, $ticket['email']);
 
 /* Ticket locked? */
 if ($ticket['locked']) {
-    hesk_process_messages($hesklang['tislock2'], 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999));
+    hesk_process_messages($hesklang['tislock2'],'ticket.php');
     exit();
 }
 
@@ -226,6 +230,5 @@ else {
 hesk_cleanSessionVars('ticket_message');
 
 /* Show the ticket and the success message */
-hesk_process_messages($hesklang['reply_submitted_success'], 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999), 'SUCCESS');
+hesk_process_messages($hesklang['reply_submitted_success'],'ticket.php','SUCCESS');
 exit();
-?>
diff --git a/submit_ticket.php b/submit_ticket.php
index 1fea838f..d8c89261 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/suggest_articles.php b/suggest_articles.php
index 6de0f996..af966e03 100644
--- a/suggest_articles.php
+++ b/suggest_articles.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/suggest_email.php b/suggest_email.php
index 9967f998..78eeb074 100644
--- a/suggest_email.php
+++ b/suggest_email.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
diff --git a/ticket.php b/ticket.php
index ae95fa4e..493895a7 100644
--- a/ticket.php
+++ b/ticket.php
@@ -1,7 +1,7 @@
 <?php
 /*******************************************************************************
  *  Title: Help Desk Software HESK
- *  Version: 2.6.6 from 2nd February 2016
+ *  Version: 2.6.7 from 18th April 2016
  *  Author: Klemen Stirn
  *  Website: http://www.hesk.com
  ********************************************************************************
@@ -56,21 +56,40 @@ $hesk_error_buffer = array();
 $do_remember = '';
 $display = 'none';
 
-/* Was this accessed by the form or link? */
-$is_form = isset($_GET['f']) ? 1 : 0;
-
-/* Get the tracking ID */
-$trackingID = hesk_cleanID();
-
-/* Email required to view ticket? */
-$my_email = hesk_getCustomerEmail(1);
-
 /* A message from ticket reminder? */
-if (!empty($_GET['remind'])) {
+if ( ! empty($_GET['remind']) )
+{
     $display = 'block';
     print_form();
 }
 
+// Do we have parameters in query string? If yes, store them in session and redirect
+if ( isset($_GET['track']) || isset($_GET['e']) || isset($_GET['f']) || isset($_GET['r']) )
+{
+    $_SESSION['t_track'] = hesk_GET('track');
+    $_SESSION['t_email'] = hesk_getCustomerEmail(1);
+    $_SESSION['t_form']  = hesk_GET('f');
+    $_SESSION['t_remember'] = strlen($do_remember) ? 'Y' : hesk_GET('r');
+
+    header('Location: ticket.php');
+    die();
+}
+
+/* Was this accessed by the form or link? */
+$is_form = hesk_SESSION('t_form');
+
+/* Get the tracking ID */
+$trackingID = hesk_SESSION('t_track');
+
+/* Email required to view ticket? */
+$my_email = hesk_getCustomerEmail(1, 't_email');
+
+/* Remember email address? */
+$do_remember = strlen($do_remember) || strlen(hesk_SESSION('t_remember')) ? ' checked="checked" ' : '';
+
+/* Clean ticket parameters from the session data, we don't need them anymore */
+hesk_cleanSessionVars( array('t_track', 't_email', 't_form', 't_remember') );
+
 /* Any errors? Show the form */
 if ($is_form) {
     if (empty($trackingID)) {
@@ -138,9 +157,8 @@ hesk_cleanBfAttempts();
 
 /* Remember email address? */
 if ($is_form) {
-    if (!empty($_GET['r'])) {
+    if ( strlen($do_remember) ) {
         setcookie('hesk_myemail', $my_email, strtotime('+1 year'));
-        $do_remember = ' checked="checked" ';
     } elseif (isset($_COOKIE['hesk_myemail'])) {
         setcookie('hesk_myemail', '');
     }
@@ -319,7 +337,7 @@ if (!$show['show']) {
         <div class="row ticketMessageContainer">
             <div class="col-md-3 col-xs-12">
                 <div class="ticketName"><?php echo $ticket['name']; ?></div>
-                <div class="ticketEmail"><?php echo $ticket['email']; ?></div>
+                <div class="ticketEmail"><a href="mailto:<?php echo $ticket['email']; ?>"><?php echo $ticket['email']; ?></a></div>
             </div>
             <div class="col-md-9 col-xs-12 pushMarginLeft">
                 <div class="ticketMessageTop withBorder">