Patch MessageController and setup