Comment 6 for bug 563

Yes, it is a rewrite. To avoid code duplication I had to move things around into functions. I did reuse most of the code, but since the indention changed diff does not pick up that fact;-)

I'll send this upstream, but I tried that before I filled this bug. So far I have not recieved a reply.