nicer email formatting #2675