moved mail stuff out of development