change mail client to singleton