Hey, Florian. I applied this patch to release-candidate/0.6, manually adding in the formatting fixes in the same patch. I also applied the test patch, modified to use the add_message test suite function, which makes the patch a bit simpler. Thanks for the fixes. jamie.