From 1e121abcc0a80d0ce80e34c7bf88e980bf788270 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 10:09:36 -0400
Subject: [PATCH] Merge branch 'Cambra/ispconfig3-favourite_servers'

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

diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 98966fd..b231495 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -85,6 +85,12 @@
                     {tmpl_var name='smtp_crypt'}
                 </select>
             </div>
+            <div class="ctrlHolder">
+                <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
+                <select name="default_mailserver" id="default_mailserver" class="selectInput">
+                    {tmpl_var name='default_mailserver'}
+                </select>
+            </div>
         </fieldset>
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

--
Gitblit v1.9.1