Fixes #202 Selecting the receiving endpoint before searching by message Id