Merge "Speed up of message backup/restore" into nyc-dev
am: f85836f

* commit 'f85836f11f05beb8a724621f90bbe13caa6e3a7f':
  Speed up of message backup/restore