Patches to improve mail sending.