change hardcoded value to messageproperties
resolved conflict
Merge pull request #795 from nutan-gooru/dev-branch

Change hardcoded value to messageproperties