Rejigged messages message at last!