Messages JS fix