fix mailer

@mennaamr , @mnzaki check that branch please