General Changes to Messages System