various tweaks to mail setup among others