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

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