DEFECT-2: Adjust parsing of SMS to new scheme