Fix problems with mailing