diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 97f6a97480..81a2ad8478 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -142,6 +142,7 @@
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.updateDispositionActionDefinition=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.isNextDispositionActionEligible=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getNextDispositionAction=RM.Read.0
+                org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.updateDispositionWhenLinkingOrUnlinking=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getCompletedDispositionActions=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.getLastCompletedDispostionAction=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService.isDisposableItemCutoff=RM.Read.0
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
index ed2ed79ecd..67e0ff072d 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
@@ -264,4 +264,12 @@ public interface DispositionService
      * @return the initial disposition
      */
     DispositionSchedule getOriginDispositionSchedule(NodeRef nodeRef);
+    
+    /**
+     * Updates disposition action step when linking or unlinking 
+     * the given record to/from a record folder
+     * 
+     * @param record
+     */
+    void updateDispositionWhenLinkingOrUnlinking(NodeRef record);
 }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
index 3a6e1d5beb..272a2beb7a 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
@@ -1094,6 +1094,26 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
         }
         return null;
     }
+    
+    public void updateDispositionWhenLinkingOrUnlinking(NodeRef record)
+    {
+        List<NodeRef> recordFolders = recordFolderService.getRecordFolders(record);
+        
+        DispositionAction nextDispositionAction = getNextDispositionAction(record);
+        
+        NextActionFromDisposition dsNextAction = getNextDispositionAction(record, recordFolders, nextDispositionAction);
+        final NodeRef action = dsNextAction.getNextActionNodeRef();
+        final Date dispositionActionDate = dsNextAction.getNextActionDateAsOf();
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork()
+            {
+                nodeService.setProperty(action, PROP_DISPOSITION_AS_OF, dispositionActionDate);
+                return null;
+            }
+        });
+    }
 
     /**
      * Helper method to determine if a node is frozen or has frozen children
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 a523ac93b6..c56cec4f50 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
@@ -34,14 +34,12 @@ import java.util.Set;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.BeforeFileRecord;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.OnFileRecord;
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
-import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionScheduleImpl;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
 import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
@@ -547,6 +545,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
                             // create and file the content as a record
                             file(nodeRef);
+                            // recalculate disposition schedule for the record when linking it
+                            dispositionService.updateDispositionWhenLinkingOrUnlinking(nodeRef);
                         }
                     }
                 }
@@ -1695,7 +1695,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
         // ensure we are linking a record to a record folder
         if(isRecord(record) && isRecordFolder(recordFolder))
         {
-            // ensure that we are not linking a record to an exisiting location
+            // ensure that we are not linking a record to an existing location
             List<ChildAssociationRef> parents = nodeService.getParentAssocs(record);
             for (ChildAssociationRef parent : parents)
             {
@@ -1718,6 +1718,9 @@ public class RecordServiceImpl extends BaseBehaviourBean
                 record,
                 ContentModel.ASSOC_CONTAINS,
                 QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name));
+            
+            // recalculate disposition schedule for the record when linking it
+            dispositionService.updateDispositionWhenLinkingOrUnlinking(record);
         }
         else
         {
@@ -1774,6 +1777,9 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
             // remove the link
             nodeService.removeChild(recordFolder, record);
+            
+            // recalculate disposition schedule for record after unlinking it
+            dispositionService.updateDispositionWhenLinkingOrUnlinking(record);
         }
         else
         {