Formatting of emails updated to spec