fixed messages controller