diff --git a/admin/manage_email_templates.php b/admin/manage_email_templates.php
new file mode 100644
index 00000000..3e8dbad9
--- /dev/null
+++ b/admin/manage_email_templates.php
@@ -0,0 +1,92 @@
+<?php
+/*******************************************************************************
+ *  Title: Help Desk Software HESK
+ *  Version: 2.6.2 from 18th March 2015
+ *  Author: Klemen Stirn
+ *  Website: http://www.hesk.com
+ ********************************************************************************
+ *  COPYRIGHT AND TRADEMARK NOTICE
+ *  Copyright 2005-2015 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');
+require(HESK_PATH . 'inc/admin_functions.inc.php');
+hesk_load_database_functions();
+
+hesk_session_start();
+hesk_dbConnect();
+hesk_isLoggedIn();
+
+// TODO Check permissions for this feature
+
+/* Print header */
+require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
+
+/* Print main manage users page */
+require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+?>
+
+<div class="row" style="padding: 20px">
+    <ul class="nav nav-tabs" role="tablist">
+        <?php
+        // Show a link to banned_emails.php if user has permission
+        if ( hesk_checkPermission('can_ban_emails',0) )
+        {
+            echo '
+            <li role="presentation">
+                <a title="' . $hesklang['banemail'] . '" href="banned_emails.php">'.$hesklang['banemail'].'</a>
+            </li>
+            ';
+        }
+        if ( hesk_checkPermission('can_ban_ips',0) )
+        {
+            echo '
+            <li role="presentation">
+                <a title="' . $hesklang['banip'] . '" href="banned_ips.php">'.$hesklang['banip'].'</a>
+            </li>';
+        }
+        // Show a link to status_message.php if user has permission to do so
+        if ( hesk_checkPermission('can_service_msg',0) )
+        {
+            echo '
+            <li role="presentation">
+                <a title="' . $hesklang['sm_title'] . '" href="service_messages.php">' . $hesklang['sm_title'] . '</a>
+            </li>';
+        }
+        ?>
+        <li role="presentation" class="active">
+            <a href="#"><?php echo $hesklang['email_templates']; ?> <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" title="<?php echo $hesklang['email_templates']; ?>" data-content="<?php echo $hesklang['email_templates_intro']; ?>"></i></a>
+        </li>
+    </ul>
+    <div class="tab-content summaryList tabPadding">
+        <!-- Content here -->
+    </div>
+</div>
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index cf5de85e..fde4cf83 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -21,6 +21,10 @@ $hesklang['_COLLATE']='utf8_unicode_ci';
 // This is the email break line that will be used in email piping
 $hesklang['EMAIL_HR']='------ Reply above this line ------';
 
+// ADDED OR MODIFIED IN Mods for HESK 2.2.0
+$hesklang['email_templates'] = 'Email templates';
+$hesklang['email_templates_intro'] = 'You can edit your plaintext and HTML email templates here.';
+
 // ADDED OR MODIFIED IN Mods for HESK 2.1.1
 $hesklang['new_article_default_type'] = 'Default Type for New Articles';
 $hesklang['new_article_default_type_help'] = 'Choose the default type for new knowledgebase articles.';