Added support for inline images and minor name changes in the MailBuilder