Add dynamic templaiting for messages