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