Deleting messages from the stream always fails

The implementation of searchEvents(Query) creates a new Query with the predefined prefix. When doing this, it doesn't re-bind all the parameters bound on the old Query, thus losing all the parameters. In org.xwiki.messagestream.internal.DefaultMessageStream.deleteMessage(String), when first trying to search for the message an exception is thrown (not all parameter are bound).