Mail parsing tweaks.