Message's system improvements