Merge change 23114 into eclair

* changes:
  Fix upload of read state for Exchange emails