Bug 822882 - Initial bisect sync fix try #2. a=bustage-fix

Land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/146