One more round of e-mail tweaks