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

№8 for the two following rules