Enabling message santization again