Resolve some warnings when not building with IMAP_STORAGE