confirmation message completed
merge with origin mailer_stuff