user mailer changed
merging mailer changes