If that is OK with you I'd suggest that either you or Jean-Marc apply Jean-Marcs version of the patch, and I'll work from there. We would live with may view items, but I will have a patch in the next few days (or the weekend et the latest).
Since JMarc's version of the patch does not solve every problem, I would prefer waiting for your patch and test them together. This should not cause you any trouble since your patch can be developed/tested independent of this one. Cheers, Bo