Messaging Clean up

Message changes for fetching messages