I looked it up, and the title of the episode was "The Emissary" [S2E20] (although, yes, either I remembered a few details incorrectly or the Wikipedia synopsis of the plot is incomplete).