Bug 1084333 - Fix message from property to entity r=aeftimie r=amatei