continued modifying the form mailer
fixed merge conflicts