Second step of MessageController refactoring (Unified Repositories)