tweaks to style and e-mail handling