Hmm - this has an impact on calendar and contacts as well again ... and I would need to rerun all the tests. We better get this moving.

@icewind1991