Adding email capacity