diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
index e8ae768e8b..b0c0a05a81 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordService.java
@@ -95,6 +95,13 @@ public interface RecordService
     */
    boolean isFiled(NodeRef record);
 
+   /**
+    * 'File' a new document that arrived in the file plan structure.
+    * 
+    * @param nodeRef    record
+    */
+   void file(NodeRef record);
+   
    /**
     * Hides a record within a collaboration site
     *
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 52a6036bc7..861d7f3f9f 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
@@ -343,7 +343,7 @@ public class RecordServiceImpl implements RecordService,
             public Void doWork() throws Exception
             {
                 NodeRef nodeRef = childAssocRef.getChildRef();
-                if (nodeService.exists(nodeRef) == true)
+                if (nodeService.exists(nodeRef) == true  && !nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) && !nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY))
                 {
                     // create and file the content as a record
                     file(nodeRef);
@@ -694,7 +694,8 @@ public class RecordServiceImpl implements RecordService,
      *
      * @param record node reference to record (or soon to be record!)
      */
-    private void file(NodeRef record)
+    @Override
+    public void file(NodeRef record)
     {
         ParameterCheck.mandatory("item", record);