more mail stuff, better interface