Fix messages controller