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

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