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

* commit 'e0cc62d72fb5d860e1dc0ea581c052784f6fdce2':
  Revert "Remove extra Imap authenticator"