Messages system improvements