Merge branch 'fix-4030' into 'stable-3.1'

Till Brehm

2016-07-21 4f8673d1eef39fde0e5d1a3ca6580f396f14ff63

 interface/web/mail/lib/lang/en_mail_user.lng

@@ -21,6 +21,7 @@
$wb["quota_txt"] = 'Quota (0 for unlimited)';
$wb["server_id_txt"] = 'Aerver_id';
$wb["password_txt"] = 'Password';
$wb['password_click_to_set_txt'] = 'Click to set';
$wb["maildir_txt"] = 'Maildir';
$wb["postfix_txt"] = 'Enable receiving';
$wb['greylisting_txt'] = 'Enable greylisting';