More tweaks to email setup