Fixes on Mailing functions