added changes in message system
merged issues branch