am 9092d591: Merge "Optimization for detemining conversation position" into jb-ub-mail-ur8

* commit '9092d591d07a1ebd2b75707e7abea75be8af3ae3':
  Optimization for detemining conversation position