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

* commit '2105d24e3907027943bc05d0fa14ecc9928b677c':
  Speed up of message backup/restore