diff --git a/admin/edit_post.php b/admin/edit_post.php
index 0effba60..7e0f36a0 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -82,6 +82,7 @@ if (hesk_isREQUEST('reply')) {
     }
     $reply = hesk_dbFetchAssoc($result);
     $ticket['message'] = $reply['message'];
+    $ticket['html'] = $reply['html'];
     $is_reply = 1;
 }
 
@@ -465,47 +466,42 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <div class="form-group">
                     <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?>:</label>
 
-                    <div class="col-sm-9">
-                        <?php
-                        $message = $modsForHesk_settings['rich_text_for_tickets'] ? hesk_html_entity_decode($ticket['message']) : $ticket['message'];
-                        ?>
-                        <textarea class="form-control htmlEditor" name="message" rows="12"
-                                  placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>"
-                                  cols="60"><?php echo $message; ?></textarea>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <input type="hidden" name="save" value="1"/><input type="hidden" name="track"
-                                                                       value="<?php echo $trackingID; ?>"/>
-                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                <div class="col-sm-9">
                     <?php
-                    if ($is_reply) {
-                        ?>
-                        <input type="hidden" name="reply" value="<?php echo $tmpvar['id']; ?>"/>
-                        <?php
-                    }
+                    $message = $ticket['html'] ? hesk_html_entity_decode($ticket['message']) : $ticket['message'];
                     ?>
+                    <textarea class="form-control htmlEditor" name="message" rows="12"
+                              placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>"
+                              cols="60"><?php echo $message; ?></textarea>
                 </div>
-                <div class="form-group">
-                    <div class="col-md-9 col-md-offset-3">
-                        <?php
-                        $html = $modsForHesk_settings['rich_text_for_tickets'] ? 1 : 0;
-                        ?>
-                        <input type="hidden" name="html" value="<?php echo $html; ?>">
-                        <?php if (isset($_REQUEST['isManager']) && $_REQUEST['isManager']): ?>
-                            <input type="hidden" name="isManager" value="1">
-                        <?php endif; ?>
-                        <div class="btn-group">
-                            <input type="submit" value="<?php echo $hesklang['save_changes']; ?>" class="btn btn-primary"/>
-                            <a class="btn btn-default" href="javascript:history.go(-1)"><?php echo $hesklang['back']; ?></a>
-                        </div>
-                    </div>
-                </div>
-            </form>
-        </div>
+            </div>
+            <div class="form-group">
+                <input type="hidden" name="save" value="1"/><input type="hidden" name="track"
+                                                                   value="<?php echo $trackingID; ?>"/>
+                <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                <?php
+                if ($is_reply) {
+                    ?>
+                    <input type="hidden" name="reply" value="<?php echo $tmpvar['id']; ?>"/>
+                    <?php
+                }
+                ?>
+            </div>
+            <div class="form-group" style="text-align: center">
+                <?php
+                $html = $ticket['html'] ? 1 : 0;
+                ?>
+                <input type="hidden" name="html" value="<?php echo $html; ?>">
+                <input type="submit" value="<?php echo $hesklang['save_changes']; ?>" class="btn btn-default"/>
+                <?php if (isset($_REQUEST['isManager']) && $_REQUEST['isManager']): ?>
+                    <input type="hidden" name="isManager" value="1">
+                <?php endif; ?>
+                <a class="btn btn-default" href="javascript:history.go(-1)"><?php echo $hesklang['back']; ?></a>
+            </div>
+        </form>
     </div>
-</section>
-<?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
+</div>
+<?php if ($ticket['html']): ?>
     <script type="text/javascript">
         /* <![CDATA[ */
         tinyMCE.init({
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 2e0b0d2e..cedc18e8 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -233,6 +233,64 @@ $show_quick_help = $show['show'];
                         <div class="help-block with-errors"></div>
                     </div>
                 </div>
+                <div class="form-group">
+                    <label for="email" class="col-sm-3 control-label"><?php echo $hesklang['email']; ?></label>
+
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="email" size="40" maxlength="1000" id="email-input"
+                               value="<?php if (isset($_SESSION['as_email'])) {
+                                   echo stripslashes(hesk_input($_SESSION['as_email']));
+                               } else if (isset($_GET['email'])) {
+                                   echo hesk_GET('email');
+                               } ?>" <?php if ($hesk_settings['detect_typos']) {
+                            echo ' onblur="Javascript:hesk_suggestEmail(1)"';
+                        } ?>
+                               placeholder="<?php echo htmlspecialchars($hesklang['email']); ?>"
+                               onkeyup="disableIfEmpty('email-input','notify-email')">
+                    </div>
+
+                </div>
+                <div id="email_suggestions"></div>
+                <!-- Department and Priority -->
+                <?php
+                $has_error = '';
+
+                if (in_array('category', $_SESSION['iserror'])) {
+                    $has_error = 'has-error';
+                } elseif (in_array('category', $_SESSION['isnotice'])) {
+                    $has_error = 'has-warning';
+                }
+                ?>
+                <div class="form-group <?php echo $has_error; ?>">
+                    <label for="category" class="col-sm-3 control-label"><?php echo $hesklang['category']; ?><span
+                            class="important">*</span></label>
+
+                    <div class="col-sm-9">
+                        <select name="category" class="form-control"
+                                pattern="[0-9]+"
+                                data-error="<?php echo htmlspecialchars($hesklang['sel_app_cat']); ?>"
+                                required>
+                            <?php
+                            // Show the "Click to select"?
+                            if ($hesk_settings['select_cat']) {
+                                echo '<option value="">' . $hesklang['select'] . '</option>';
+                            }
+                            // List categories
+                            $orderByColumn = $modsForHesk_settings['category_order_column'];
+                            $result = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories` WHERE `usage` <> 2 ORDER BY `' . $orderByColumn . '` ASC');
+                            while ($row = hesk_dbFetchAssoc($result)) {
+                                if (isset($_SESSION['as_category']) && $_SESSION['as_category'] == $row['id']) {
+                                    $selected = ' selected="selected"';
+                                } else {
+                                    $selected = '';
+                                }
+                                echo '<option value="' . $row['id'] . '"' . $selected . '>' . $row['name'] . '</option>';
+                            }
+                            ?>
+                        </select>
+                        <div class="help-block with-errors"></div>
+                    </div>
+                </div>
                 <?php
                 $has_error = '';
                 if (in_array('priority', $_SESSION['iserror'])) {