add major fix to Messages Controller