Merge change Ie2804ddc into eclair

* changes:
  Fix #2225869 (Regression in attachment loading / Exchange 2003)