fine tuning the mail handling