Fixed messages properties issue

Change-Id: Iff96f9228ba4907c31b4a7c14f1ded8dc650f5f4