am 74daafb8: am e0cc62d7: Merge "Revert "Remove extra Imap authenticator"" into jb-ub-mail-ur9

* commit '74daafb87b1aef10446dad822ac602c30ff33a55':
  Revert "Remove extra Imap authenticator"