uplift -- bug 828890 (+858722): Scroll bar should not go over the header

[bug 828890](https://bugzilla.mozilla.org/show_bug.cgi?id=828890) + [bug 858722](https://bugzilla.mozilla.org/show_bug.cgi?id=858722)