Misc tweaks to mail sources