Bug 1011604 - [Messages] Update to use <gaia-header>

№4, although I don't know the rationale behind that, but let's keep it