more email formatting improvements