am 9ab4553e: Merge "Remove extra Imap authenticator" into jb-ub-mail-ur9

* commit '9ab4553ea8094ba076f705a39e031c713e8e54d1':
  Remove extra Imap authenticator