diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index d92716441b..291e85fd64 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1305,6 +1305,7 @@ edit_file_description=Edit the properties of the file then click OK.
 edit_folder_properties=Edit Folder Properties
 edit_folder_description=Edit the properties of the folder then click OK.
 folder_props=Folder Properties
+folder_props_warn=Folder rename may take a while.
 snapshot_properties=Snapshot Properties
 snapshot_label=Label
 snapshot_success=Snapshot ''{0}'' created for sandbox: {1}
diff --git a/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java b/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java
index ddc94c6d7b..7cbd7996a7 100644
--- a/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditFolderPropertiesDialog.java
@@ -30,6 +30,7 @@ import javax.faces.context.FacesContext;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
+import org.alfresco.repo.avm.LayeredFolderType;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -168,8 +169,20 @@ public class EditFolderPropertiesDialog extends EditSpaceDialog
       // perform the rename last as for an AVM it changes the NodeRef
       if (name != null)
       {
-         this.getFileFolderService().rename(nodeRef, name);
-         editedProps.put(ContentModel.PROP_NAME.toString(), name);
+         // OnMoveNodePolicy behavior differs for Web-Client and external calls (FTP, CIFS)
+         // Flag is set for the current thread
+         Boolean wasIssuedByWebClient = LayeredFolderType.isIssuedByWebClient();
+         try
+         {
+            LayeredFolderType.setIssuedByWebClient(true);
+            this.getFileFolderService().rename(nodeRef, name);
+            editedProps.put(ContentModel.PROP_NAME.toString(), name);
+         }
+         finally
+         {
+            LayeredFolderType.setIssuedByWebClient(wasIssuedByWebClient);
+         }
+
       }
       
       return outcome;
diff --git a/source/web/jsp/wcm/edit-folder-properties.jsp b/source/web/jsp/wcm/edit-folder-properties.jsp
index f297028559..8743a318c5 100644
--- a/source/web/jsp/wcm/edit-folder-properties.jsp
+++ b/source/web/jsp/wcm/edit-folder-properties.jsp
@@ -20,6 +20,24 @@
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+
+<f:verbatim>
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+<tr>
+<td width="100%" valign="top">
+<% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<tr>
+<td valign=top style="padding-top:2px" width=20></f:verbatim><h:graphicImage url="/images/icons/info_icon.gif" width="16" height="16"/><f:verbatim></td>
+<td class="mainSubText"></f:verbatim><h:outputText value="#{msg.folder_props_warn}" /><f:verbatim></td>
+</tr>
+</table>
+<% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
+</td>
+</tr>
+</table>
+</f:verbatim>
 
 <h:panelGrid columns="1" rowClasses="wizardSectionHeading, paddingRow" 
              cellpadding="2" cellspacing="2" width="100%">