Moved message and title into HTML email structure