Removed messages from user controller to messages controller
Made changes as per cr comments