diff --git a/.gitignore b/.gitignore
index 769f689f..05965a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -268,6 +268,5 @@ language/index.htm
 print_sec_img.php
 rate.php
 readme.html
-reply_ticket.php
 robots.txt
 .idea/
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index a62f9665..3f1916d0 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -539,7 +539,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <?php
                             $random=rand(10000,99999);
 
-                            $statusSql = 'SELECT `ID`, `TicketViewContentKey`, `IsStaffClosedOption`, `IsStaffReopenedStatus` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsStaffClosedOption` = 1 OR `IsStaffReopenedStatus` = 1';
+                            $statusSql = 'SELECT `ID`, `ShortNameContentKey`, `IsStaffClosedOption`, `IsStaffReopenedStatus` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsStaffClosedOption` = 1 OR `IsStaffReopenedStatus` = 1';
                             $statusRs = hesk_dbQuery($statusSql);
                             $staffClosedOptionStatus = array();
                             $staffReopenedStatus = array();
@@ -551,7 +551,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 } else
                                 {
                                     $staffClosedOptionStatus['ID'] = $statusRow['ID'];
-                                    $staffClosedOptionStatus['TicketViewContentKey'] = $statusRow['TicketViewContentKey'];
                                 }
                             }
 
diff --git a/language/en/text.php b/language/en/text.php
index ae23b495..72255e8f 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -44,6 +44,7 @@ $hesklang['shortNameRequired'] = 'Short Name Key is required.';
 $hesklang['longNameRequired'] = 'Long Name Key is required.';
 $hesklang['textColorRequired'] = 'Text Color is required.';
 $hesklang['addNew'] = 'Add New';
+$hesklang['close_action']='Close Ticket'; // Close ACTION
 
 
 // ADDED OR MODIFIED IN HESK UI
@@ -837,7 +838,6 @@ $hesklang['auto']='(automatically)';
 $hesklang['unknown']='Unknown';
 $hesklang['pcer']='Please correct the following errors:';
 $hesklang['seqid']='Ticket number';
-$hesklang['close_action']='Mark ticket Resolved'; // Close ACTION
 $hesklang['archived']='Tagged';
 $hesklang['archived2']='Tagged Ticket';
 $hesklang['add_archive']='Tag this ticket';
diff --git a/reply_ticket.php b/reply_ticket.php
new file mode 100644
index 00000000..be9a2bc1
--- /dev/null
+++ b/reply_ticket.php
@@ -0,0 +1,225 @@
+<?php
+/*******************************************************************************
+*  Title: Help Desk Software HESK
+*  Version: 2.5.3 from 16th March 2014
+*  Author: Klemen Stirn
+*  Website: http://www.hesk.com
+********************************************************************************
+*  COPYRIGHT AND TRADEMARK NOTICE
+*  Copyright 2005-2014 Klemen Stirn. All Rights Reserved.
+*  HESK is a registered trademark of Klemen Stirn.
+
+*  The HESK may be used and modified free of charge by anyone
+*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
+*  By using this code you agree to indemnify Klemen Stirn from any
+*  liability that might arise from it's use.
+
+*  Selling the code for this program, in part or full, without prior
+*  written consent is expressly forbidden.
+
+*  Using this code, in part or full, to create derivate work,
+*  new scripts or products is expressly forbidden. Obtain permission
+*  before redistributing this software over the Internet or in
+*  any other medium. In all cases copyright and header must remain intact.
+*  This Copyright is in full effect in any country that has International
+*  Trade Agreements with the United States of America or
+*  with the European Union.
+
+*  Removing any of the copyright notices without purchasing a license
+*  is expressly forbidden. To remove HESK copyright notice you must purchase
+*  a license for this script. For more information on how to obtain
+*  a license please visit the page below:
+*  https://www.hesk.com/buy.php
+*******************************************************************************/
+
+define('IN_SCRIPT',1);
+define('HESK_PATH','./');
+
+/* Get all the required files and functions */
+require(HESK_PATH . 'hesk_settings.inc.php');
+require(HESK_PATH . 'inc/common.inc.php');
+hesk_load_database_functions();
+require(HESK_PATH . 'inc/email_functions.inc.php');
+require(HESK_PATH . 'inc/posting_functions.inc.php');
+
+// We only allow POST requests to this file
+if ( $_SERVER['REQUEST_METHOD'] != 'POST' )
+{
+	header('Location: index.php');
+	exit();
+}
+
+// Check for POST requests larger than what the server can handle
+if ( empty($_POST) && ! empty($_SERVER['CONTENT_LENGTH']) )
+{
+	hesk_error($hesklang['maxpost']);
+}
+
+hesk_session_start();
+
+/* A security check */
+# hesk_token_check('POST');
+
+$hesk_error_buffer = array();
+
+// Tracking ID
+$trackingID  = hesk_cleanID('orig_track') or die($hesklang['int_error'].': No orig_track');
+
+// Email required to view ticket?
+$my_email = hesk_getCustomerEmail();
+
+// Get message
+$message = hesk_input( hesk_POST('message') );
+
+// If the message was entered, further parse it
+if ( strlen($message) )
+{
+	// Make links clickable
+	$message = hesk_makeURL($message);
+
+	// Turn newlines into <br />
+	$message = nl2br($message);
+}
+else
+{
+	$hesk_error_buffer[] = $hesklang['enter_message'];
+}
+
+/* Attachments */
+if ($hesk_settings['attachments']['use'])
+{
+    require(HESK_PATH . 'inc/attachments.inc.php');
+    $attachments = array();
+    for ($i=1;$i<=$hesk_settings['attachments']['max_number'];$i++)
+    {
+        $att = hesk_uploadFile($i);
+        if ($att !== false && !empty($att))
+        {
+            $attachments[$i] = $att;
+        }
+    }
+}
+$myattachments='';
+
+/* Any errors? */
+if (count($hesk_error_buffer)!=0)
+{
+    $_SESSION['ticket_message'] = hesk_POST('message');
+
+	// If this was a reply after re-opening a ticket, force the form at the top
+	if ( hesk_POST('reopen') == 1)
+	{
+		$_SESSION['force_form_top'] = true;
+	}
+
+	// Remove any successfully uploaded attachments
+	if ($hesk_settings['attachments']['use'])
+	{
+		hesk_removeAttachments($attachments);
+	}
+
+    $tmp = '';
+    foreach ($hesk_error_buffer as $error)
+    {
+        $tmp .= "<li>$error</li>\n";
+    }
+    $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));
+}
+
+/* Connect to database */
+hesk_dbConnect();
+
+/* Get details about the original ticket */
+$res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `trackid`='{$trackingID}' LIMIT 1");
+if (hesk_dbNumRows($res) != 1)
+{
+	hesk_error($hesklang['ticket_not_found']);
+}
+$ticket = hesk_dbFetchAssoc($res);
+
+/* If we require e-mail to view tickets check if it matches the one in database */
+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));
+	exit();
+}
+
+/* Insert attachments */
+if ($hesk_settings['attachments']['use'] && !empty($attachments))
+{
+    foreach ($attachments as $myatt)
+    {
+        hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."attachments` (`ticket_id`,`saved_name`,`real_name`,`size`) VALUES ('{$trackingID}','".hesk_dbEscape($myatt['saved_name'])."','".hesk_dbEscape($myatt['real_name'])."','".intval($myatt['size'])."')");
+        $myattachments .= hesk_dbInsertID() . '#' . $myatt['real_name'] .',';
+    }
+}
+
+// If staff hasn't replied yet, don't change the status; otherwise set it to the status for customer replies.
+$customerReplyStatusQuery = 'SELECT `ID` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsCustomerReplyStatus` = 1';
+$defaultNewTicketStatusQuery = 'SELECT `ID` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsNewTicketStatus` = 1';
+$newStatus = hesk_dbQuery($customerReplyStatusQuery)->fetch_assoc();
+$defaultNewTicketStatus = hesk_dbQuery($defaultNewTicketStatusQuery)->fetch_assoc();
+
+$ticket['status'] = $ticket['status'] == $defaultNewTicketStatus['ID'] ? $defaultNewTicketStatus['ID'] : $newStatus['ID'];
+
+/* Update ticket as necessary */
+$res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `lastchange`=NOW(), `status`='{$ticket['status']}',`lastreplier`='0' WHERE `id`='{$ticket['id']}' LIMIT 1");
+
+// Insert reply into database
+hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`) VALUES ({$ticket['id']},'".hesk_dbEscape($ticket['name'])."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."')");
+
+
+/*** Need to notify any staff? ***/
+
+// --> Prepare reply message
+
+// 1. Generate the array with ticket info that can be used in emails
+$info = array(
+'email'			=> $ticket['email'],
+'category'		=> $ticket['category'],
+'priority'		=> $ticket['priority'],
+'owner'			=> $ticket['owner'],
+'trackid'		=> $ticket['trackid'],
+'status'		=> $ticket['status'],
+'name'			=> $ticket['name'],
+'lastreplier'	=> $ticket['name'],
+'subject'		=> $ticket['subject'],
+'message'		=> stripslashes($message),
+'attachments'	=> $myattachments,
+'dt'			=> hesk_date($ticket['dt']),
+'lastchange'	=> hesk_date($ticket['lastchange']),
+);
+
+// 2. Add custom fields to the array
+foreach ($hesk_settings['custom_fields'] as $k => $v)
+{
+	$info[$k] = $v['use'] ? $ticket[$k] : '';
+}
+
+// 3. Make sure all values are properly formatted for email
+$ticket = hesk_ticketToPlain($info, 1, 0);
+
+// --> If ticket is assigned just notify the owner
+if ($ticket['owner'])
+{
+	hesk_notifyAssignedStaff(false, 'new_reply_by_customer', 'notify_reply_my');
+}
+// --> No owner assigned, find and notify appropriate staff
+else
+{
+	hesk_notifyStaff('new_reply_by_customer',"`notify_reply_unassigned`='1'");
+}
+
+/* Clear unneeded session variables */
+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');
+exit();
+?>