diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
index afb99cc9..24a3e667 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -251,6 +251,7 @@
         <!-- MozillaNlpBackend -->
         <item>org.microg.nlp.backend.ichnaea</item>
         <!-- Printing -->
+        <item>com.android.bips</item>
         <item>com.android.printspooler</item>
     </string-array>
 
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc202-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc202-mnc1/mms_config.xml
index 07a11b44..7c91e134 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc202-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc202-mnc1/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="6">
+<mms_config version="7">
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="smsUsesSimpleCharactersOnly">false</bool>
     <bool name="allowEnablingWapPushSI">true</bool>
@@ -9,4 +9,5 @@
     <int name="maxImageWidth">1600</int>
     <bool name="useCustomUserAgent">true</bool>
     <bool name="allowEditingSmscAddress">true</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc214-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc214-mnc1/mms_config.xml
index e4e54ad7..012ba1e5 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc214-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc214-mnc1/mms_config.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="10">
+<mms_config version="11">
+    <bool name="enabledMMS">false</bool>
+    <bool name="enableGroupMms">false</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="smsUsesSimpleCharactersOnly">true</bool>
     <bool name="smsEncodingChangeable">true</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
-    <int name="maxMessageSize">307200</int>
-    <int name="maxImageHeight">1200</int>
-    <int name="maxImageWidth">1600</int>
     <bool name="allowEditingSmscAddress">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc216-mnc30/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc216-mnc30/mms_config.xml
index 04c68d08..ab36fcb3 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc216-mnc30/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc216-mnc30/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="5">
+<mms_config version="6">
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
     <int name="maxMessageSize">307200</int>
@@ -9,4 +9,5 @@
     <bool name="allowEditingSmscAddress">true</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc219-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc219-mnc1/mms_config.xml
index 7a5f86dd..992327ca 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc219-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc219-mnc1/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="6">
+<mms_config version="7">
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
@@ -8,4 +8,5 @@
     <int name="maxImageWidth">1600</int>
     <bool name="useCustomUserAgent">true</bool>
     <bool name="allowEditingSmscAddress">true</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc219-mnc2/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc219-mnc2/mms_config.xml
new file mode 100644
index 00000000..992327ca
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc219-mnc2/mms_config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="7">
+    <bool name="groupChatDefaultsToMMS">false</bool>
+    <bool name="allowEnablingWapPushSI">false</bool>
+    <bool name="enableWapPushSI">true</bool>
+    <int name="maxMessageSize">307200</int>
+    <int name="maxImageHeight">1200</int>
+    <int name="maxImageWidth">1600</int>
+    <bool name="useCustomUserAgent">true</bool>
+    <bool name="allowEditingSmscAddress">true</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc222-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc222-mnc1/mms_config.xml
index 1f7597d9..0dc62b6a 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc222-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc222-mnc1/mms_config.xml
@@ -5,4 +5,6 @@
     <int name="maxImageHeight">1944</int>
     <int name="maxImageWidth">2592</int>
     <bool name="smsUsesSimpleCharactersOnly">false</bool>
+    <bool name="enableSMSDeliveryReports">true</bool>
+    <bool name="smsDeliveryReportSettingOnByDefault">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc1/mms_config.xml
index fc2b8a8e..8be7eade 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc1/mms_config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="5">
+<mms_config version="6">
+    <bool name="enabledMMS">false</bool>
+    <bool name="enableGroupMms">false</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
-    <int name="maxMessageSize">307200</int>
-    <int name="maxImageHeight">1944</int>
-    <int name="maxImageWidth">2592</int>
     <bool name="allowEditingSmscAddress">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc3/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc3/mms_config.xml
index 5f0f480c..572c89f3 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc3/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc3/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="5">
+<mms_config version="6">
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
     <int name="maxMessageSize">307200</int>
@@ -8,4 +8,5 @@
     <bool name="useCustomUserAgent">true</bool>
     <bool name="allowEditingSmscAddress">true</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc6/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc6/mms_config.xml
index 1f416ef7..3b923182 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc6/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc226-mnc6/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="5">
+<mms_config version="6">
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
     <int name="maxMessageSize">307200</int>
@@ -7,4 +7,5 @@
     <int name="maxImageWidth">1600</int>
     <bool name="useCustomUserAgent">true</bool>
     <bool name="allowEditingSmscAddress">true</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc228-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc228-mnc1/mms_config.xml
index 8d4dd3e7..f113e3fe 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc228-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc228-mnc1/mms_config.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="2">
-    <int name="maxMessageSize">307200</int>
-    <int name="maxImageHeight">1944</int>
-    <int name="maxImageWidth">2592</int>
+<mms_config version="3">
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
-    <bool name="enableGroupMms">true</bool>
-    <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="enabledMMS">false</bool>
+    <bool name="enableGroupMms">false</bool>
+    <bool name="groupChatDefaultsToMMS">false</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc231-mnc2/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc231-mnc2/mms_config.xml
index 04c68d08..ab36fcb3 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc231-mnc2/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc231-mnc2/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="5">
+<mms_config version="6">
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
     <int name="maxMessageSize">307200</int>
@@ -9,4 +9,5 @@
     <bool name="allowEditingSmscAddress">true</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc260-mnc2/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc260-mnc2/mms_config.xml
index e6e85cd3..202c972d 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc260-mnc2/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc260-mnc2/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="5">
+<mms_config version="6">
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
@@ -8,4 +8,5 @@
     <int name="maxImageWidth">1600</int>
     <bool name="useCustomUserAgent">true</bool>
     <bool name="allowEditingSmscAddress">true</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc1/mms_config.xml
index 31452653..67a4ae07 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc1/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc1/mms_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="6">
+<mms_config version="7">
     <bool name="smsUsesSimpleCharactersOnly">false</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
@@ -10,4 +10,5 @@
     <bool name="allowEditingSmscAddress">true</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc2/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc2/mms_config.xml
index fae6533d..8a00c817 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc2/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc262-mnc2/mms_config.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="8">
+<mms_config version="9">
+    <bool name="enabledMMS">false</bool>
+    <bool name="enableGroupMms">false</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="smsUsesSimpleCharactersOnly">false</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
-    <int name="maxMessageSize">307200</int>
-    <int name="maxImageHeight">1944</int>
-    <int name="maxImageWidth">2592</int>
     <bool name="allowEditingSmscAddress">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc276-mnc2/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc276-mnc2/mms_config.xml
index f783ffaa..983eff2a 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc276-mnc2/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc276-mnc2/mms_config.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="5">
+<mms_config version="6">
     <bool name="enabledMMS">false</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="enableGroupMms">false</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
-    <int name="maxMessageSize">307200</int>
-    <int name="maxImageHeight">1944</int>
-    <int name="maxImageWidth">2592</int>
     <bool name="allowEditingSmscAddress">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc150/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc150/mms_config.xml
index badb8588..8cd28126 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc150/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc150/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc170/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc170/mms_config.xml
index dc31d90a..79e99b1a 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc170/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc170/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc280/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc280/mms_config.xml
index 10e9fe63..5fc56fd7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc280/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc280/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc30/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc30/mms_config.xml
index 10e9fe63..5fc56fd7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc30/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc30/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc380/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc380/mms_config.xml
index badb8588..8cd28126 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc380/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc380/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc410/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc410/mms_config.xml
index badb8588..8cd28126 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc410/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc410/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc560/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc560/mms_config.xml
index badb8588..8cd28126 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc560/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc560/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc66/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc66/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc66/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc730/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc730/mms_config.xml
new file mode 100644
index 00000000..2988e392
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc730/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc950/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc950/mms_config.xml
index 10e9fe63..5fc56fd7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc950/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc310-mnc950/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc180/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc180/mms_config.xml
index bda0fc96..7caa0986 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc180/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc180/mms_config.xml
@@ -6,4 +6,5 @@
     <int name="recipientLimit">20</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc220/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc220/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc220/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc220/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc221/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc221/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc221/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc221/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc222/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc222/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc222/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc222/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc223/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc223/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc223/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc223/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc224/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc224/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc224/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc224/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc225/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc225/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc225/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc225/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc226/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc226/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc226/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc226/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc227/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc227/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc227/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc227/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc228/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc228/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc228/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc228/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc229/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc229/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc229/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc229/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc581/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc581/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc581/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc581/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc582/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc582/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc582/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc582/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc583/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc583/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc583/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc583/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc584/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc584/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc584/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc584/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc585/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc585/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc585/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc585/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc586/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc586/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc586/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc586/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc587/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc587/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc587/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc587/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc588/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc588/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc588/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc588/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc589/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc589/mms_config.xml
index 660d89b5..7c296d49 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc589/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc311-mnc589/mms_config.xml
@@ -17,4 +17,5 @@
     <int name="maxFrameRate">15</int>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <string name="spamForwardingNumber">7726</string>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc312-mnc670/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc312-mnc670/mms_config.xml
index 10e9fe63..5fc56fd7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc312-mnc670/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc312-mnc670/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc100/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc100/mms_config.xml
index 10e9fe63..5fc56fd7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc100/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc100/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc130/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc130/mms_config.xml
index 10e9fe63..5fc56fd7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc130/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc130/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc140/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc140/mms_config.xml
index 10e9fe63..5fc56fd7 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc140/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc140/mms_config.xml
@@ -12,4 +12,5 @@
     <bool name="supportMmsPriority">false</bool>
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc340/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc340/mms_config.xml
new file mode 100644
index 00000000..630b2df8
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313-mnc340/mms_config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableWapPushSI">true</bool>
+    <bool name="allowEnablingWapPushSI">true</bool>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313/mms_config.xml
index a5fd3835..f74791df 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc313/mms_config.xml
@@ -2,4 +2,5 @@
 <mms_config version="1">
     <bool name="enableGroupMms">true</bool>
     <bool name="groupChatDefaultsToMMS">true</bool>
+    <bool name="useCustomUserAgent">true</bool>
 </mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc427-mnc2/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc427-mnc2/mms_config.xml
index e392fdf2..23101997 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc427-mnc2/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc427-mnc2/mms_config.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="4">
+<mms_config version="5">
     <bool name="enabledMMS">false</bool>
     <bool name="groupChatDefaultsToMMS">false</bool>
     <bool name="enableGroupMms">false</bool>
-    <int name="maxMessageSize">307200</int>
-    <int name="maxImageHeight">1944</int>
-    <int name="maxImageWidth">2592</int>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
     <bool name="allowEditingSmscAddress">true</bool>
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc460-mnc15/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc460-mnc15/mms_config.xml
new file mode 100644
index 00000000..c5a3e101
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc460-mnc15/mms_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enabledMMS">false</bool>
+    <bool name="groupChatDefaultsToMMS">false</bool>
+    <bool name="enableGroupMms">false</bool>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc1/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc1/mms_config.xml
new file mode 100644
index 00000000..459edff0
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc1/mms_config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <int name="maxMessageSize">614400</int>
+    <int name="maxImageHeight">1944</int>
+    <int name="maxImageWidth">2592</int>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc92/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc92/mms_config.xml
new file mode 100644
index 00000000..c5f5747c
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc92/mms_config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <int name="maxMessageSize">307200</int>
+    <int name="maxImageHeight">1944</int>
+    <int name="maxImageWidth">2592</int>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc97/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc97/mms_config.xml
new file mode 100644
index 00000000..a75444bf
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc466-mnc97/mms_config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <bool name="enableGroupMms">true</bool>
+    <bool name="groupChatDefaultsToMMS">true</bool>
+    <int name="maxMessageSize">1048576</int>
+    <int name="maxImageHeight">2432</int>
+    <int name="maxImageWidth">4320</int>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc547-mnc5/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc547-mnc5/mms_config.xml
new file mode 100644
index 00000000..fe266897
--- /dev/null
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc547-mnc5/mms_config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mms_config version="1">
+    <int name="maxMessageSize">307200</int>
+    <int name="maxImageHeight">480</int>
+    <int name="maxImageWidth">640</int>
+    <int name="recipientLimit">-1</int>
+    <int name="maxMessageTextSize">-1</int>
+    <bool name="groupChatDefaultsToMMS">false</bool>
+    <int name="smsToMmsTextThreshold">-1</int>
+</mms_config>
\ No newline at end of file
diff --git a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc602-mnc2/mms_config.xml b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc602-mnc2/mms_config.xml
index 63342a20..062c071e 100644
--- a/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc602-mnc2/mms_config.xml
+++ b/Patches/Common/android_vendor_divested/overlay/common/packages/apps/Messaging/res/xml-mcc602-mnc2/mms_config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mms_config version="3">
-    <int name="maxMessageSize">102400</int>
+<mms_config version="4">
+    <bool name="enabledMMS">false</bool>
+    <bool name="groupChatDefaultsToMMS">false</bool>
+    <bool name="enableGroupMms">false</bool>
     <bool name="allowEnablingWapPushSI">false</bool>
     <bool name="enableWapPushSI">true</bool>
     <bool name="allowEditingSmscAddress">true</bool>
diff --git a/Patches/Common/apns-conf.xml b/Patches/Common/apns-conf.xml
index 78a6480e..9101a466 100644
--- a/Patches/Common/apns-conf.xml
+++ b/Patches/Common/apns-conf.xml
@@ -3312,19 +3312,22 @@
   <apn carrier="DTAC GPRS WEB" mcc="520" mnc="18" apn="www.dtac.co.th" type="default,supl" />
   <apn carrier="True" mcc="520" mnc="99" apn="internet" user="true" password="true" type="default,supl" />
   <apn carrier="True MMS" mcc="520" mnc="99" apn="mms" user="true" password="true" mmsc="http://mms.trueworld.net:8002" mmsproxy="10.4.7.39" mmsport="8080" type="mms" />
-  <apn carrier="SingTel (PostPaid)" mcc="525" mnc="01" apn="e-ideas" mmsproxy="165.21.42.84" mmsport="8080" mmsc="http://mms.singtel.com:10021/mmsc" type="default,supl,mms" />
-  <apn carrier="SingTel (PrePaid)" mcc="525" mnc="01" apn="hicard" mmsproxy="165.21.42.84" mmsport="8080" mmsc="http://mms.singtel.com:10021/mmsc" type="default,supl,mms" />
-  <apn carrier="SingTel (PostPaid)" mcc="525" mnc="02" apn="e-ideas" mmsproxy="165.21.42.84" mmsport="8080" mmsc="http://mms.singtel.com:10021/mmsc" type="default,supl,mms" />
-  <apn carrier="SingTel (PrePaid)" mcc="525" mnc="02" apn="hicard" mmsproxy="165.21.42.84" mmsport="8080" mmsc="http://mms.singtel.com:10021/mmsc" type="default,supl,mms" />
-  <apn carrier="Sunsurf Mobile" mcc="525" mnc="03" apn="sunsurf" type="default,supl" />
-  <apn carrier="M1 MMS(3G)" mcc="525" mnc="03" apn="miworld" user="65" password="user123" mmsc="http://mmsgw:8002" mmsproxy="172.16.14.10" mmsport="8080" authtype="1" type="mms" />
-  <apn carrier="Sunsurf Mobile" mcc="525" mnc="04" apn="sunsurf" type="default,supl" />
-  <apn carrier="M1 MMS(3G)" mcc="525" mnc="04" apn="miworld" user="65" password="user123" authtype="1" mmsc="http://mmsgw:8002" mmsproxy="172.16.14.10" mmsport="8080" type="mms" />
-  <apn carrier="SH Data Postpaid" mcc="525" mnc="05" apn="shwap" type="default,supl" />
-  <apn carrier="SH Data Prepaid" mcc="525" mnc="05" apn="shppd" type="default,supl" />
-  <apn carrier="SH MMS Postpaid" mcc="525" mnc="05" apn="shmms" mmsc="http://mms.starhubgee.com.sg:8002/" mmsproxy="10.12.1.80" mmsport="80" type="mms" />
-  <apn carrier="TPG SG" mcc="525" mnc="10" apn="TPG" type="default,mms,supl" protocol="IPV4V6" roaming_protocol="IPV4V6" />
-  <apn carrier="TPG SG IMS" mcc="525" mnc="10" apn="ims" type="ims" protocol="IPV4V6" roaming_protocol="IPV4V6" />
+  <apn carrier="Singtel (Postpaid)" carrier_id="31" mcc="525" mnc="01" apn="e-ideas" mmsproxy="165.21.42.84" mmsport="8080" mmsc="http://mms.singtel.com:10021/mmsc" type="default,ia,supl,mms" protocol="IPV4V6" roaming_protocol="IPV4V6" />
+  <apn carrier="Singtel (Prepaid)" carrier_id="31" mcc="525" mnc="01" apn="hicard" mmsproxy="165.21.42.84" mmsport="8080" mmsc="http://mms.singtel.com:10021/mmsc" type="default,ia,supl,mms" protocol="IPV4V6" roaming_protocol="IPV4V6" />
+  <apn carrier="Singtel IMS" carrier_id="31" mcc="525" mnc="01" apn="ims" type="ims" protocol="IPV4V6" roaming_protocol="IPV4V6" user_visible="false" />
+  <apn carrier="Singtel Ut" carrier_id="31" mcc="525" mnc="01" apn="stm-ut" type="xcap" protocol="IPV4V6" roaming_protocol="IPV4V6" user_visible="false" />
+  <apn carrier="Sunsurf Mobile" carrier_id="1706" mcc="525" mnc="03" apn="sunsurf" type="default,ia,supl" protocol="IPV4V6" roaming_protocol="IPV4V6" />
+  <apn carrier="M1 MMS" carrier_id="1706" mcc="525" mnc="03" apn="miworld" user="65" password="user123" mmsc="http://mmsgw:8002" mmsproxy="172.16.14.10" mmsport="8080" authtype="1" type="mms" />
+  <apn carrier="M1 IMS" carrier_id="1706" mcc="525" mnc="03" apn="IMS" type="ims" protocol="IPV4V6" roaming_protocol="IPV4V6" user_visible="false" />
+  <apn carrier="M1 XCAP" carrier_id="1706" mcc="525" mnc="03" apn="XCAP" type="xcap" protocol="IPV4V6" roaming_protocol="IPV4V6" network_type_bitmask="18" user_visible="false" />
+  <apn carrier="M1 hos" carrier_id="1706" mcc="525" mnc="03" apn="hos" type="xcap" protocol="IPV4V6" roaming_protocol="IPV4V6" network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20" user_visible="false" />
+  <apn carrier="giga" carrier_id="2434" mcc="525" mnc="05" apn="giga" type="default,ia,supl" protocol="IPV4V6" roaming_protocol="IPV4V6" />
+  <apn carrier="SH Data Postpaid" carrier_id="1707" mcc="525" mnc="05" apn="shwap" type="default,ia,supl" protocol="IPV4V6" roaming_protocol="IPV4V6" />
+  <apn carrier="SH Data Prepaid" carrier_id="1707" mcc="525" mnc="05" apn="shppd" type="default,ia,supl" protocol="IPV4V6" roaming_protocol="IPV4V6" />
+  <apn carrier="SH IMS" carrier_id="1707" mcc="525" mnc="05" apn="ims" type="ims" protocol="IPV4V6" roaming_protocol="IPV4V6" user_visible="false" />
+  <apn carrier="SH XCAP" carrier_id="1707" mcc="525" mnc="05" apn="shxcap" type="xcap" protocol="IPV4V6" roaming_protocol="IPV4V6" user_visible="false" />
+  <apn carrier="亞太電信(APT) (Internet)" carrier_id="1707" mcc="525" mnc="05" apn="gtnet" type="default,ia,supl" protocol="IPV4V6" roaming_protocol="IP" mvno_type="gid" mvno_match_data="0A" />
+  <apn carrier="SIMBA" mcc="525" mnc="10" apn="tpg" type="default,ia,supl" protocol="IPV4V6" />
   <apn carrier="B-Mobile MMS" mcc="528" mnc="02" apn="bmobilemms" mmsc="http://mms.bmobile.com.bn/was" mmsproxy="129.9.10.20" mmsport="6500" type="mms" />
   <apn carrier="B-Mobile" mcc="528" mnc="02" apn="bmobilewap" type="default,supl" />
   <apn carrier="DSTCom" mcc="528" mnc="11" apn="dst.internet" user="internet" password="internet" type="default,supl" />
diff --git a/Patches/Common/wireless-regdb/db.txt b/Patches/Common/wireless-regdb/db.txt
index 915a3b94..ac2429e4 100644
--- a/Patches/Common/wireless-regdb/db.txt
+++ b/Patches/Common/wireless-regdb/db.txt
@@ -748,12 +748,16 @@ country GY:
 	(5490 - 5730 @ 160), (23), DFS
 	(5735 - 5835 @ 80), (30)
 
+# Source:
+# https://www.ofca.gov.hk/filemanager/ofca/en/content_401/hkca1039.pdf (2.4 GHz and 5 GHz)
+# https://www.ofca.gov.hk/filemanager/ofca/en/content_401/hkca1081.pdf (6 GHz)
 country HK: DFS-ETSI
-	(2402 - 2482 @ 40), (20)
-	(5170 - 5250 @ 80), (17), AUTO-BW
-	(5250 - 5330 @ 80), (24), DFS, AUTO-BW
-	(5490 - 5710 @ 160), (24), DFS
-	(5735 - 5835 @ 80), (30)
+	(2400 - 2483.5 @ 40), (36)
+	(5150 - 5250 @ 80), (23), AUTO-BW, NO-OUTDOOR
+	(5250 - 5350 @ 80), (23), DFS, AUTO-BW, NO-OUTDOOR
+	(5470 - 5730 @ 160), (27), DFS
+	(5730 - 5850 @ 80), (36)
+	(5925 - 6425 @ 160), (14)
 
 country HN: DFS-FCC
 	(2402 - 2482 @ 40), (20)
@@ -850,11 +854,14 @@ country IL: DFS-ETSI
 	# Table B List of conditions, row 68, wireless device using 802.11a/n/ac protocol
 	(5725 - 5875 @ 80), (200 mW), AUTO-BW
 
+# Source:
+# https://dot.gov.in/spectrummanagement/delicensing-24-24835-ghz-band-gsr-45-e-5150-5350-ghz-gsr-46-e-and-5725-5875-ghz
+# https://dot.gov.in/spectrummanagement/license-exemption-5-ghz-gsr-1048e-dated-22102018
 country IN:
-	(2402 - 2482 @ 40), (20)
+	(2402 - 2482 @ 40), (30)
 	(5150 - 5250 @ 80), (30)
-	(5250 - 5350 @ 80), (24)
-	(5470 - 5725 @ 160), (24)
+	(5250 - 5350 @ 80), (24), DFS
+	(5470 - 5725 @ 160), (24), DFS
 	(5725 - 5875 @ 80), (30)
 
 country IR: DFS-JP
@@ -1500,11 +1507,12 @@ country RS: DFS-ETSI
 	# 60 GHz band channels 1-4, ref: Etsi En 302 567
 	(57000 - 66000 @ 2160), (40)
 
-# Source: https://docs.cntd.ru/document/902048009?section=text
-country RU: DFS-ETSI
-	(2400 - 2483.5 @ 40), (20)
-	(5150 - 5350 @ 160), (100 mW), NO-OUTDOOR, DFS
-	(5650 - 5850 @ 160), (100 mW), NO-OUTDOOR, DFS
+# Source: https://docs.cntd.ru/document/1300597464?section=text
+country RU:
+	(2400 - 2483.5 @ 40), (100mW)
+	(5150 - 5350 @ 160), (100 mW), NO-OUTDOOR
+	(5650 - 5850 @ 160), (100 mW), NO-OUTDOOR
+	(5925 - 6425 @ 160), (100 mW), NO-OUTDOOR
 	# 60 GHz band channels 1-4, ref: Changes to NLA 124_Order №129_22042015.pdf
 	(57000 - 66000 @ 2160), (40), NO-OUTDOOR
 
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index f928dd8b..eab7ac7a 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -193,7 +193,7 @@ export -f audit2allowADB;
 
 processRelease() {
 	#Reference (MIT): GrapheneOS
-	#https://github.com/GrapheneOS/script/blob/12.1/release.sh
+	#https://github.com/GrapheneOS/script/blob/13/release.sh
 	local DEVICE="$1";
 	local BLOCK="$2";
 	local VERITY="$3";
diff --git a/Scripts/Update_Commons.sh b/Scripts/Update_Commons.sh
index dd959fde..24c87f6b 100644
--- a/Scripts/Update_Commons.sh
+++ b/Scripts/Update_Commons.sh
@@ -29,11 +29,11 @@ wget "https://github.com/LineageOS/android_packages_apps_LineageParts/raw/lineag
 
 #TODO: wireless-regdb
 #https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/
-#Last: 2023/04/29
+#Last: 2023/05/24
 
 #TODO: MMS Configs
 #https://github.com/GrapheneOS/platform_packages_apps_Messaging
-#Last: 2023/04/29
+#Last: 2023/05/24
 
 #TODO: Carrier List, unused
 #https://android.googlesource.com/platform/packages/providers/TelephonyProvider/