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 fef83bfca8..acad997020 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
@@ -44,7 +44,6 @@
             <ref bean="rmEditRecordMetadataCapability"/>
             <ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
             <ref bean="rmEditHoldCapability"/>
-            <ref bean="rmCreateRecordsCapability"/>
          </list>
       </property>
    </bean>
@@ -63,7 +62,6 @@
             <ref bean="rmEditRecordMetadataCapability"/>
             <ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
             <ref bean="rmEditHoldCapability"/>
-            <ref bean="rmCreateRecordsCapability"/>
          </list>
       </property>
    </bean>
@@ -135,6 +133,7 @@
    <bean id="rmCopyRecordCapability"
       parent="declarativeCapability">
       <property name="name" value="CopyRecord"/>
+      <property name="permission" value="CreateRecords"/>
       <property name="private" value="true"/>
       <property name="kinds">
          <list>
@@ -153,6 +152,7 @@
    <bean id="rmCopyUnfiledRecordCapability"
       parent="declarativeCapability">
       <property name="name" value="CopyUnfiledRecord"/>
+      <property name="permission" value="CreateRecords"/>
       <property name="private" value="true"/>
       <property name="kinds">
          <list>
@@ -170,6 +170,7 @@
    <bean id="rmCopyRecordFolderCapability"
       parent="declarativeCapability">
       <property name="name" value="CopyRecordFolder"/>
+      <property name="permission" value="CreateModifyDestroyFolders"/>
       <property name="private" value="true"/>
       <property name="kinds">
          <list>
@@ -204,6 +205,7 @@
    <bean id="rmCopyRecordCategoryCapability"
       parent="declarativeCapability">
       <property name="name" value="CopyRecordCategory"/>
+      <property name="permission" value="CreateModifyDestroyFileplanMetadata"/>
       <property name="private" value="true"/>
       <property name="kinds">
          <list>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index 77bf507775..9172a21fe1 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -17,6 +17,11 @@
       <property name="group"><ref bean="recordsGroup"/></property>
       <property name="index" value="35" />
       <property name="permission" value="CreateRecords"/>
+      <property name="kinds">
+         <list>
+            <value>RECORD_FOLDER</value>
+         </list>
+      </property>
       <property name="conditions">
          <map>
             <entry key="capabilityCondition.filling" value="true"/>
@@ -124,7 +129,7 @@
       <property name="group"><ref bean="recordsGroup"/></property>
       <property name="index" value="45" />
    </bean>
-   
+
    <bean id="rmDeleteLinksCapability"
          parent="declarativeCapability">
       <property name="name" value="DeleteLinks"/>
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-copy-to.post.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-copy-to.post.json.js
index d30977c673..6240f64306 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-copy-to.post.json.js
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-copy-to.post.json.js
@@ -50,7 +50,7 @@ function runAction(p_params)
          if (!rmService.getRecordsManagementNode(destNode).hasCapability("FillingPermissionOnly"))
          {
             result.name = fileNode.name;
-            result.error = "The destination is either frozen, closed or cut off!";
+            result.error = "You don't have filing permission on the destination or the destination is either frozen, closed or cut off!";
             results.push(result);
             continue;
          }
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-link.post.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-link.post.json.js
index cd59632202..d25b92dbf2 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-link.post.json.js
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-link.post.json.js
@@ -48,7 +48,7 @@ function runAction(p_params)
          if (!rmService.getRecordsManagementNode(destNode).hasCapability("FillingPermissionOnly"))
          {
             result.name = fileNode.name;
-            result.error = "The destination is either frozen, closed or cut off!";
+            result.error = "You don't have filing permission on the destination or the destination is either frozen, closed or cut off!";
             results.push(result);
             continue;
          }
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-move-to.post.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-move-to.post.json.js
index e15afd8aa8..a8b66dcce6 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-move-to.post.json.js
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/rm-move-to.post.json.js
@@ -50,7 +50,7 @@ function runAction(p_params)
          if (!rmService.getRecordsManagementNode(destNode).hasCapability("FillingPermissionOnly"))
          {
             result.name = fileNode.name;
-            result.error = "The destination is either frozen, closed or cut off!";
+            result.error = "You don't have filing permission on the destination or the destination is either frozen, closed or cut off!";
             results.push(result);
             continue;
          }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileReportAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileReportAction.java
index d28d8d84b2..ce74c1dbb7 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileReportAction.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileReportAction.java
@@ -145,7 +145,7 @@ public class FileReportAction extends RMActionExecuterAbstractBase implements Re
     {
         if (AccessStatus.DENIED.equals(capabilityService.getCapability("FillingPermissionOnly").hasPermission(nodeRef)))
         {
-            throw new AlfrescoRuntimeException("The destination is either frozen, closed or cut off!");
+            throw new AlfrescoRuntimeException("You don't have filing permission on the destination or the destination is either frozen, closed or cut off!");
         }
     }