A two-component whitening system has a de-sensitizing effect as well as re-mineralizing capability. The system may be an unfoamed, a foamed or a foamablecomposition. The system has a first component with at least one peroxidecompound, at least one source of phosphate and at least one gelling agent; anda second component with at least one source of calcium, strontium and/ormixtures thereof. The second component may also contain at least one gellingagent, and the composition maybe present as a foam or is foamable. Thecomposition may be packed in a two-compartment syringe.