Fix up the emails