Bug fix: message with same is now no more added multiple times.