Support reading from Maildir directly, instead of IMAP
Merge with remote changes