Fix to miss messages that replied to non-last message