IMAP bandaid of sorts
Merge pull request #15 from singjsong/master

IMAP bandaid of sorts