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

* commit 'a01c85229b61b3deb412180e7212bf296f9a83b6':
  Revert "Revert "Remove extra Imap authenticator""  :)