Merge "Fixed a NP when replying to a message"