More work on Announcement emails