Merge branch 'master' into 'master'

Marius Cramer

2014-10-11 b98be2e5bcd1abfb98a544fdad66696007925b38

 interface/web/mail/templates/mail_user_mailbox_edit.htm

@@ -45,6 +45,10 @@
                <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
            </div>
            <div class="ctrlHolder">
                <label for="sender_name">{tmpl_var name='sender_cc_txt'}</label>
                <input name="sender_cc" id="sender_cc" value="{tmpl_var name='sender_cc'}" size="30" maxlength="255" type="text" class="textInput" /> &nbsp; {tmpl_var name='name_optional_txt'} {tmpl_var name='sender_cc_note_txt'}
            </div>
            <div class="ctrlHolder">
                <label for="policy">{tmpl_var name='policy_txt'}</label>
                <select name="policy" id="policy" class="selectInput">
                    {tmpl_var name='policy'}