Hack to get multi-msg responses working.

Will probably still fail in the case of current messages but it's better than
abject failure.