Merge pull request #858 from laanwj/2012_02_uisendlabelfix