diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 67e426d507b..05bf78aadd1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -557,6 +557,7 @@
     <string-array name="app_ops_categories">
         <item>Location</item>
         <item>Personal</item>
+        <item>Messaging</item>
         <item>Device</item>
     </string-array>
 
@@ -568,14 +569,23 @@
         <item>vibrate</item>
         <item>read contacts</item>
         <item>write contacts</item>
-        <item>read calls</item>
-        <item>write calls</item>
+        <item>read call log</item>
+        <item>write call log</item>
         <item>read calendar</item>
         <item>write calendar</item>
         <item>wi-fi scan</item>
         <item>notification</item>
         <item>cell scan</item>
         <item>call phone</item>
+        <item>read SMS</item>
+        <item>write SMS</item>
+        <item>receive SMS</item>
+        <item>receive emergency SMS</item>
+        <item>receive MMS</item>
+        <item>receive WAP push</item>
+        <item>send SMS</item>
+        <item>read ICC SMS</item>
+        <item>write ICC SMS</item>
     </string-array>
     
     <!-- User display names for app ops codes -->
@@ -586,14 +596,23 @@
         <item>Vibrate</item>
         <item>Read contacts</item>
         <item>Write contacts</item>
-        <item>Read calls</item>
-        <item>Write calls</item>
+        <item>Read call log</item>
+        <item>Write call log</item>
         <item>Read calendar</item>
         <item>Write calendar</item>
         <item>Location</item>
         <item>Post notification</item>
         <item>Location</item>
         <item>Call phone</item>
+        <item>Receive SMS/MMS</item>
+        <item>Send SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Send SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Send SMS/MMS</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 43fa090cdd7..b2d862f66e9 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -124,6 +124,27 @@ public class AppOpsState {
                     true }
             );
 
+    public static final OpsTemplate MESSAGING_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_READ_SMS,
+                    AppOpsManager.OP_RECEIVE_SMS,
+                    AppOpsManager.OP_RECEIVE_EMERGECY_SMS,
+                    AppOpsManager.OP_RECEIVE_MMS,
+                    AppOpsManager.OP_RECEIVE_WAP_PUSH,
+                    AppOpsManager.OP_WRITE_SMS,
+                    AppOpsManager.OP_SEND_SMS,
+                    AppOpsManager.OP_READ_ICC_SMS,
+                    AppOpsManager.OP_WRITE_ICC_SMS },
+            new boolean[] { true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true }
+            );
+
     public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
             new int[] { AppOpsManager.OP_VIBRATE,
                     AppOpsManager.OP_POST_NOTIFICATION,
@@ -134,7 +155,7 @@ public class AppOpsState {
             );
 
     public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
-            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, DEVICE_TEMPLATE
+            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE, DEVICE_TEMPLATE
     };
 
     /**
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index 1e0cd4115f6..b0d9ad158b0 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -42,6 +42,7 @@ public class AppOpsSummary extends Fragment {
     static AppOpsState.OpsTemplate[] sPageTemplates = new AppOpsState.OpsTemplate[] {
         AppOpsState.LOCATION_TEMPLATE,
         AppOpsState.PERSONAL_TEMPLATE,
+        AppOpsState.MESSAGING_TEMPLATE,
         AppOpsState.DEVICE_TEMPLATE
     };