Added email formatting