Merge branch 'patch-3' into 'stable-3.1'

Till Brehm

2016-07-01 1d87d80fb9eb9a2712e90726a89048f7c03c5995

1
2
3
4
5
6
7
<?php
$wb["mailbox_spamfilter_txt"] = 'Spamfilter';
$wb["spamfilter_txt"] = 'Spamfilter';
$wb["email_txt"] = 'Email';
$wb["no_policy"] = '- not enabled -';
$wb["policy_txt"] = 'Policy';
?>