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 3c774e5435..c14db066d1 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
@@ -135,6 +135,7 @@
             <entry key="capabilityCondition.recordFiled" value="true"/>
          </map>
       </property>
+      <property name="targetCapability" ref="rmFileRecordsCapability"/>
    </bean>
 
    <bean id="rmCopyRecordFolderCapability"
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
index 3e44cfed78..f5f8a01993 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
@@ -363,7 +363,7 @@ public class RecordServiceImpl implements RecordService,
 		policyComponent.bindClassBehaviour(
                 NodeServicePolicies.OnRemoveAspectPolicy.QNAME, 
                 ContentModel.ASPECT_NO_CONTENT, 
-                new JavaBehaviour(this, "onRemoveAspect", NotificationFrequency.TRANSACTION_COMMIT));
+                new JavaBehaviour(this, "onRemoveAspect", NotificationFrequency.EVERY_EVENT));
     }
     
     /**
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java
index aad44f2355..3e75b406df 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java
@@ -111,10 +111,21 @@ public class RecordFolderServiceImpl extends    ServiceBaseImpl
     public void onCreateChildAssociationInRecordFolder(ChildAssociationRef childAssocRef, boolean bNew)
     {
         NodeRef nodeRef = childAssocRef.getChildRef();
-        if (nodeService.exists(nodeRef) == true &&
-            instanceOf(nodeRef, ContentModel.TYPE_FOLDER) == true)
+        if (nodeService.exists(nodeRef) == true)
         {
-            throw new AlfrescoRuntimeException("You can't create a folder within an exisiting record folder.");
+            // ensure folders are never added to a record folder
+            if (instanceOf(nodeRef, ContentModel.TYPE_FOLDER) == true)
+            {
+                throw new AlfrescoRuntimeException("You can't create a folder within an exisiting record folder.");
+            }
+            
+            // ensure nothing is being added to a closed record folder
+            NodeRef recordFolder = childAssocRef.getParentRef();
+            Boolean isClosed = (Boolean) this.nodeService.getProperty(recordFolder, PROP_IS_CLOSED);
+            if (isClosed != null && Boolean.TRUE.equals(isClosed) == true)
+            {
+                throw new AlfrescoRuntimeException("You can't add new items to a closed record folder.");
+            }
         }
     }