Handle message properties nicely

Change-Id: I1eee4c7cb9d4e9ebf46713ff941365a7502ce5aa
Merge "Handle message properties nicely"