solved some mailing issues