Merge pull request #1 from lightsofapollo/bug-900894

Add fakeserver helpers
Bug 900894 - Manually setup a IMAP email account.
sockets