Improved mail handling