[AMOS commit] MDL-55566 chat: Improve next scheduled chat message Committed into Git: 2016-11-08 21:00 UTC