Comment 4 for bug 1370146

At the previous London sprint we decided to do the header modes after rtm, so I did not work on this yet.

With this new planning, I'll start on this bug the coming week (there is some other header work ongoing now which is better to land first).