Added subject and body fields to contact form.  Fixes #4065