fixes bug 969042 - Correctly encode all ampersands

@rhelmer r?

I did some extensive grepping and only found this one place ;)