am 647390f6: Merge "Persist style spans in message bodies" into jb-ub-mail-ur8

* commit '647390f6a76c5fdcaba26ca8efb6be0b2766d6d1':
  Persist style spans in message bodies