Bug 879907 - [MMS] Change ordering of subheader messages r=gnarf37