mail related tweaks