applied Markus' clarify status text padding patch