Adding get messages behavior

Change-Id: I4bdd7707224f044e3e9734dc0fb46b36b6119664
Merge "Adding get messages behavior"