attachMail clean up and changes
attachMail clean up and changes