More email tweaking