Comment 8 for bug 882541

I understand from bug 629150 that how to handle nicks is still under discussion.
In the meantime, please could the trivial fix from comment #3, point 2), on this bug be applied?
Then people using custom templates not including the nick won't need to wait.