Merge pull request #16585 from asutherland/email-asflagfix

Bug 972514 - [B2G][Email] ActiveSync message state changes from server not synchronized error "Failed to parse a message: Error: Bad body type: undefined" thrown. r=mcav