Bug 943165 - [Messages] Bug 934531 follow-up: make the visual right for ...

...numbers-only headers r=julien
The conflict is here.

With the new commit, there is also a new test that is failing with your change, so you need to update it as well.