emailClient changes to create instance without context listener