MessageController updated
Merge remote-tracking branch 'origin/messageController'