I just changed the waterpump on 87 MB 190E 8V 2 weeks ago. Before i changed the waterpump, i also think that the noise came from the belt or tenioner.....

After cold started few mins later, it starts very noisy. When you press the gas, the noise becomes louder. Ended up i changed the waterpump and whole car quite!! Hope that this case can help u out.