Restructuring emailclient.