More email creation tweaks