working for mailers
mailer changes done