small refactoring for email message builder