fixed problems with mailing