working imap & other minor

- got rid of the mock stuff
- got rid of some of the conversation code
- fixed IMAP, finally...