Updated subjects
Email address optional for subjects
Completed basic message structure