Help text is truncated to the first line

Better fix for #1724.