changes committed for messaging 31-7-2014