From 57496f7c08945031b90b1e4bc5b2e0d5f4c2cec4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 30 Apr 2015 08:49:27 -0400
Subject: [PATCH] Merge branch 'renky/ispconfig3-mdbox-format'

---
 interface/web/admin/templates/server_config_mail_edit.htm |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index e076069..926be8e 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -15,6 +15,12 @@
                 <label for="maildir_path" class="col-sm-3 control-label">{tmpl_var name='maildir_path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" class="form-control" /></div></div>
             <div class="form-group">
+				<label class="col-sm-3 control-label">{tmpl_var name='maildir_format_txt'}</label>
+				<div class="col-sm-9"><select name="maildir_format" id="maildir_format" class="form-control">
+						{tmpl_var name='maildir_format'}
+					</select></div>
+			</div>
+            <div class="form-group">
                 <label for="homedir_path" class="col-sm-3 control-label">{tmpl_var name='homedir_path_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" class="form-control" /></div></div>
             <div class="form-group">

--
Gitblit v1.9.1