am a6cd7cbd: Merge "Fix IMAP send by ensuring system mailboxes exist." into jb-ub-mail-ur9

* commit 'a6cd7cbd637fd39f190889c28378c81e93489796':
  Fix IMAP send by ensuring system mailboxes exist.