added mail stuff