Fixes on mailing functions