Bug fixes for undefined variables and incorrect headers in Mailer and MailMessage classes
Merge branch 'development'