Merge change 26015 into eclair

* changes:
  Handle issues in SmartReply/SmartForward