am b3b47ef9: Merge ""Fix" Inboxes in non-English languages for IMAP." into jb-ub-mail-ur9

* commit 'b3b47ef971ff58c146d07dd3a68437ea4b9e7166':
  "Fix" Inboxes in non-English languages for IMAP.