am 88426036: Merge "optimize re-rendering a conversation for a single outgoing message" into jb-ub-mail

* commit '88426036aa25d93da67a3891d6eac47678383d1e':
  optimize re-rendering a conversation for a single outgoing message