attachMail clean up and changes