More tweaks on the emailer