Merge branch 'display_prefix_on_new' into 'master'

Marius Cramer

2014-08-11 28b52633b3eb803e61b314373a307b04bbf91136

 interface/web/admin/templates/system_config_mail_edit.htm

@@ -12,6 +12,24 @@
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailbox_show_autoresponder_tab_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailbox_show_autoresponder_tab'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailbox_show_mail_filter_tab_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailbox_show_mail_filter_tab'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailbox_show_custom_rules_tab_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailbox_show_custom_rules_tab'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='mailboxlist_webmail_link'}
@@ -67,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'}">
@@ -77,4 +101,4 @@
        </div>
    </div>
  
</div>
</div>