more fixes for the Mail settings