You can buy a special damp spray or paint to cover watermarks which you then just paint over with normal emulsion. It's sold at all the big hardware stores. I've used it on my ceilings and would recommend it. I can't remember what it's called but if you ask in B&Q I'm sure they'll point you in the right direction.