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

All cases are handled properly now.