backported fix for bnc #722053: Layout issues
new version and changes