Improved mail handling.