Fixed up email api.