Bug 1074144 - Fix Email app oauth2 authentication failure
Merge pull request #24699 from chirarobert/uplift_email_fix

Bug 1074144 - Fix Email app oauth2 authentication failure