Bug 850530 - B2G MMS: Use the same attribute name for delivery (s/state/delivery) like SMS. r=mounir sr=sicking