diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
index af101759ac..2a1fdf3960 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
@@ -18,11 +18,9 @@
       <property name="private" value="true"/>
       <property name="capabilities">
          <list>
-            <ref bean="rmDestroyRecordsScheduledForDestructionCapability"/>
-            <ref bean="rmDestroyRecordsCapability"/>
             <ref bean="rmDeleteRecordsCapability"/>
             <ref bean="rmCreateModifyDestroyFileplanMetadataCapability"/>
-            <ref bean="rmCreateModifyDestroyFoldersCapability"/>
+            <ref bean="rmDeleteRecordFolderCapability"/>
          </list>
       </property>
    </bean>
@@ -34,7 +32,7 @@
       <property name="private" value="true"/>
       <property name="capabilities">
          <list>
-            <ref bean="rmCreateModifyDestroyFoldersCapability"/>
+            <ref bean="rmModifyRecordFolderCapability"/>
             <ref bean="rmCreateModifyDestroyFileplanMetadataCapability"/>
             <ref bean="rmEditDeclaredRecordMetadataCapability"/>
             <ref bean="rmEditNonRecordMetadataCapability"/>
@@ -51,7 +49,7 @@
       <property name="private" value="true"/>
       <property name="capabilities">
          <list>
-            <ref bean="rmCreateModifyDestroyFoldersCapability"/>
+            <ref bean="rmModifyRecordFolderCapability"/>
             <ref bean="rmCreateModifyDestroyFileplanMetadataCapability"/>
             <ref bean="rmEditDeclaredRecordMetadataCapability"/>
             <ref bean="rmEditNonRecordMetadataCapability"/>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index 501c4d11a8..957ff9b0e3 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -25,23 +25,19 @@
    </bean>
 
    <bean id="rmCreateModifyDestroyFoldersCapability"
-      parent="declarativeCapability">
+         parent="compositeCapability">
+      
       <property name="name" value="CreateModifyDestroyFolders"/>
       <property name="permission" value="CreateModifyDestroyFolders"/>
-      <property name="kinds">
+	       
+      <property name="capabilities">
          <list>
-            <value>RECORD_CATEGORY</value>
-            <value>RECORD_FOLDER</value>
+            <ref bean="rmCreateRecordFolderCapability"/>
+            <ref bean="rmModifyRecordFolderCapability"/>
+            <ref bean="rmDeleteRecordFolderCapability"/>
          </list>
       </property>
-      <property name="conditions">
-         <map>
-            <entry key="capabilityCondition.filling" value="true"/>
-            <entry key="capabilityCondition.cutoff" value="false"/>
-            <entry key="capabilityCondition.frozen" value="false"/>
-            <entry key="capabilityCondition.closed" value="false"/>
-         </map>
-      </property>
+
       <property name="group"><ref bean="folderControlGroup"/></property>
       <property name="index" value="20" />
    </bean>
@@ -68,6 +64,63 @@
    </bean>
    
    <!--  Unassignable -->
+      
+   <bean id="rmCreateRecordFolderCapability"
+      parent="declarativeCapability">
+      <property name="name" value="CreateRecordFolder"/>
+      <property name="permission" value="CreateModifyDestroyFolders"/>
+      <property name="private" value="true"/>
+      <property name="kinds">
+         <list>
+            <value>RECORD_CATEGORY</value>
+         </list>
+      </property>
+      <property name="conditions">
+         <map>
+            <entry key="capabilityCondition.filling" value="true"/>
+         </map>
+      </property>
+   </bean>
+   
+   <bean id="rmModifyRecordFolderCapability"
+      parent="declarativeCapability">
+      <property name="name" value="ModifyRecordFolder"/>
+      <property name="private" value="true"/>
+      <property name="permission" value="CreateModifyDestroyFolders"/>
+      <property name="kinds">
+         <list>
+            <value>RECORD_FOLDER</value>
+         </list>
+      </property>
+      <property name="conditions">
+         <map>
+            <entry key="capabilityCondition.filling" value="true"/>
+            <entry key="capabilityCondition.cutoff" value="false"/>
+            <entry key="capabilityCondition.frozen" value="false"/>
+            <entry key="capabilityCondition.closed" value="false"/>
+         </map>
+      </property>
+   </bean>
+   
+   <bean id="rmDeleteRecordFolderCapability"
+         parent="declarativeCapability">
+      <property name="name" value="DeleteRecordFolder"/>
+      <property name="private" value="true"/>
+      <property name="permission" value="CreateModifyDestroyFolders"/>
+      <property name="kinds">
+         <list>
+            <value>RECORD_FOLDER</value>
+         </list>
+      </property>
+      <property name="conditions">
+         <map>
+            <entry key="capabilityCondition.filling" value="true"/>
+            <entry key="capabilityCondition.cutoff" value="false"/>
+            <entry key="capabilityCondition.frozen" value="false"/>
+            <entry key="capabilityCondition.closed" value="false"/>
+         </map>
+      </property>
+   </bean>
 
    <bean id="rmMoveRecordFolderCapability"
       parent="compositeCapability">
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
index 38f3346254..9245bed466 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
@@ -50,10 +50,11 @@ capability.UpdateTriggerDates.title=Update Trigger Dates
 capability.ManuallyChangeDispositionDates.title=Manually Change Disposition Dates
 capability.AuthorizeNominatedTransfers.title=Authorize Nominated Transfers
 capability.AuthorizeAllTransfers.title=Authorize All Transfers
-capability.DestroyRecordsScheduledForDestruction.title=Destroy Records Scheduled for Destruction
+capability.DestroyRecordsScheduledForDestruction.title=Destroy Record or Record Folder Scheduled for Destruction
 capability.DestroyRecords.title=Destroy Records
 capability.DeleteRecords.title=Delete Records
 capability.TriggerAnEvent.title=Trigger An Event
+capability.FileDestructionReport.title=File Destruction Report
 
 # Hold Controls
 capability.group.holdControls.title=Hold Controls