Formatting fixes for email