Fix bug with chained messages.

2 files changed