Bug 855968 - B2G MMS: delivery is not correctly indexed in DB. r=vicamo