Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 0b2c4118a0894f722318ae4d861baddb8f66fd4d

 interface/web/mailuser/templates/mail_user_spamfilter_edit.htm

@@ -7,7 +7,9 @@
        
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
                <p class="value">{tmpl_var name='email'}</p>
                <div class="col-sm-9">
               <div class="checkbox">{tmpl_var name='email'}</div>
            </div>
            </div>
            <div class="form-group">
                <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>