Added message de-duplication

Signed-off-by: Bernd Plontsch <bernd.plontsch@gmail.com>