A thickened, buffered aqueous acidic cleaning composition suitable for removing mineral deposits is provided. In one embodiment, the composition comprises a weak acid and its conjugate base wherein the weak acid has a pK.sub.a of approximately 2 to 3.5 and where the composition has a pH of approximately 2 to 3.5. Organic acids, such as citric acid, are particularly suited. The addition of a thickening system comprising cetyl trimethyl ammonium chloride and sodium xylene sulfonate or alkyl diphenylether sulfonate produces a viscoelastic composition in which the viscosity can be controlled by the level and/or ratio of the surfactant/counterion. Suitable stable adjuncts including fragrances, dyes, organic solvents, disinfectants, and bleaches can be added to the composition.