make status vaguely usable
make IMAP work, tidy up