Updates for email issue function.