More mail config fiddling