envoy vs diplomat

envoy and diplomat both are nouns.

Word	Noun	Adjective	Verb	Adverb
envoy	Yes	No	No	No
diplomat	Yes	No	No	No

As nouns, diplomat is a hypernym of envoy; that is, diplomat is a word with a broader meaning than envoy:

Other hypernyms of envoy include diplomatist.

envoy (noun)	diplomat (noun)
a brief stanza concluding certain forms of poetry	an official engaged in international negotiations
a diplomat having less authority than an ambassador	a person who deals tactfully with others
someone sent on a mission to represent the interests of someone else