Adding email clients and tests.