am 751b85e8: Merge "Fix bug 5048082 - Conversation doesn\'t scroll after you send a message"

* commit '751b85e8c3b5ff07eaaa6bdbd32517dcdc8f27aa':
  Fix bug 5048082 - Conversation doesn't scroll after you send a message