Bug 1074144 - Fix Email app oauth2 authentication failure

uplift from fc88bede50627d32601ab32b6b345b9a02ab89b4