(Bug 2150) Move spaces outside spans