[issue #352] added correct reroutes and mailer

@zoheiry @nourhanZ @NourhanMohamed @m0hamed issue #352