Server first steps

Include discussed renaming to follow IMAP convention
Some quick & dirty fixes on the client, definitively need some review