updated the mailers and might have a style conflict
updated the pull from master