Bug 860680 - [SMS][MMS] Include new layout in SMS/MMS App r=julienw