Merge change I146f63ab into eclair-mr2

* changes:
  Don't delete referenced messages from the Exchange server