-header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.)\s*\d{8,}\s*$/
-describe SHIPPING_ID Contains a long ID number at the end
+header SHIPPING_ID subject =~ /(ID:?|ID|\#|n\.)\s*\d{7,}\s*($|shipment|delivery)/
+describe SHIPPING_ID Contains a long ID number at the end or folled by shipment