add email feature part 2