MailForm Addition

I have fixed most of the issues still have work to do :)