fixed mailing issues