C2 abuali mailer fix #182

@mnzaki , @mennaamr please merge my branch