diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 75bdfb5f0d..4815d64beb 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1923,6 +1923,7 @@ error_delete_rule=Unable to delete Rule due to system error:
 error_actions=Failed to run Actions due to error: {0}
 error_rule=Failed to create Rule due to error: {0}
 error_space=Failed to create new space due to error: {0}
+error_content=Failed to create content due to error: {0}
 error_person=Failed to create Person due to error: {0}
 error_delete_user=Failed to delete User due to error: {0}
 error_remove_user=Failed to remove User due to error: {0}
diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml
index 3495e43900..be76f86bf7 100644
--- a/config/alfresco/web-client-config-forum-actions.xml
+++ b/config/alfresco/web-client-config-forum-actions.xml
@@ -260,7 +260,6 @@
             <action idref="cut_node" />
             <action idref="copy_node" />
             <action idref="delete_space" />
-            <action idref="import_space" />
             <action idref="export_space" />
             <action idref="manage_space_users" />
             <action idref="create_shortcut" />
@@ -298,7 +297,6 @@
             <action idref="copy_node" />
             <action idref="paste_all" />
             <action idref="manage_space_users" />
-            <action idref="import_space" />
             <action idref="export_space" />
          </action-group>
          
diff --git a/source/java/org/alfresco/web/bean/admin/ImportDialog.java b/source/java/org/alfresco/web/bean/admin/ImportDialog.java
index 901062a9ef..e63bbd451d 100644
--- a/source/java/org/alfresco/web/bean/admin/ImportDialog.java
+++ b/source/java/org/alfresco/web/bean/admin/ImportDialog.java
@@ -218,6 +218,14 @@ public class ImportDialog extends BaseDialogBean
       return this.fileName;
    }
    
+   /**
+    * @param fileName The name of the file
+    */
+   public void setFileName(String fileName)
+   {
+       //do nothing required for JSF workflow
+   }
+
    /**
     * Returns the encoding to use for the export
     *  
diff --git a/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java
index 950ddcd5f3..2cf5cbcc6d 100644
--- a/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/AVMClipboardItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,16 +24,20 @@
  */
 package org.alfresco.web.bean.clipboard;
 
+import java.util.Map;
+
 import javax.faces.context.FacesContext;
 import javax.transaction.UserTransaction;
 
+import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.model.FileExistsException;
-import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.NavigationBean;
@@ -98,8 +102,7 @@ public class AVMClipboardItem extends AbstractClipboardItem
          NodeRef destRef = AVMNodeConverter.ToNodeRef(-1, destPath);
          String sourcePath = AVMNodeConverter.ToAVMVersionPath(getNodeRef()).getSecond();
          
-         FileFolderService fileFolderService = getServiceRegistry().getFileFolderService();
-         AVMService avmService = getServiceRegistry().getAVMLockingAwareService();
+         //FileFolderService fileFolderService = getServiceRegistry().getFileFolderService();
          
          // initial name to attempt the copy of the item with
          String name = getName();
@@ -131,7 +134,11 @@ public class AVMClipboardItem extends AbstractClipboardItem
                         getNodeRef(),
                         destRef,
                         name);*/
-                  avmService.copy(-1, sourcePath, destPath, name);
+                  getAvmService().copy(-1, sourcePath, destPath, name);
+                  
+                  // ETHREEOH-2110
+                  AVMNodeDescriptor desc = getAvmService().lookup(-1, destPath + "/" + name);
+                  recursiveFormCheck(desc);
                   
                   // if we get here without an exception, the clipboard copy operation was successful
                   operationComplete = true;
@@ -147,7 +154,7 @@ public class AVMClipboardItem extends AbstractClipboardItem
                         getNodeRef(),
                         destRef,
                         name);*/
-                  avmService.rename(AVMNodeConverter.SplitBase(sourcePath)[0], getName(),
+                  getAvmService().rename(AVMNodeConverter.SplitBase(sourcePath)[0], getName(),
                         destPath, name);
                   
                   // if we get here without an exception, the clipboard move operation was successful
@@ -221,6 +228,14 @@ public class AVMClipboardItem extends AbstractClipboardItem
                   // inter-store copy operation
                   crossRepoCopyService.copy(getNodeRef(), destRef, name);
                   
+                  if (destRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
+                  {
+                      // ETHREEOH-2110
+                      String destPath = AVMNodeConverter.ToAVMVersionPath(destRef).getSecond();
+                      AVMNodeDescriptor desc = getAvmService().lookup(-1, destPath + "/" + name);
+                      recursiveFormCheck(desc);
+                  }
+                  
                   // if we get here without an exception, the clipboard copy operation was successful
                   operationComplete = true;
                }
diff --git a/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
index 7fe0288f7c..218aabdc04 100644
--- a/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,13 +25,17 @@
 package org.alfresco.web.bean.clipboard;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
+import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.search.QueryParameterDefImpl;
 import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.search.QueryParameterDefinition;
@@ -64,6 +68,22 @@ abstract class AbstractClipboardItem implements ClipboardItem
    private QName type;
    private String icon;
    
+   transient protected AVMService avmService;
+   
+   public void setAvmService(AVMService avmService)
+   {
+      this.avmService = avmService;
+   }
+   
+   protected AVMService getAvmService()
+   {
+      if (avmService == null)
+      {
+         avmService = getServiceRegistry().getAVMLockingAwareService();
+      }
+      return avmService;
+   }
+   
    
    /**
     * Constructor
@@ -173,4 +193,27 @@ abstract class AbstractClipboardItem implements ClipboardItem
       return (nodeRefs.size() != 0);
    }
    
+   protected void recursiveFormCheck(AVMNodeDescriptor desc)
+   {
+       if (desc.isFile())
+       {
+           String filePath = desc.getPath();
+           if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
+           {
+               avmService.removeAspect(filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
+           }
+           if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_RENDITION))
+           {
+               avmService.removeAspect(filePath, WCMAppModel.ASPECT_RENDITION);
+           }
+       }
+       else
+       {
+           Map<String, AVMNodeDescriptor> listing = getAvmService().getDirectoryListing(desc);
+           for (Map.Entry<String, AVMNodeDescriptor> entry : listing.entrySet())
+           {
+               recursiveFormCheck(entry.getValue());
+           }
+       }
+   }
 }
diff --git a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
index ea247a95e2..0774c89f6d 100644
--- a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -34,6 +34,7 @@ import javax.transaction.UserTransaction;
 import org.alfresco.model.ApplicationModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.ml.MultilingualContentService;
 import org.alfresco.service.cmr.model.FileExistsException;
@@ -43,6 +44,7 @@ import org.alfresco.service.cmr.repository.CopyService;
 import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
@@ -345,7 +347,14 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
 
                   // inter-store copy operation
                   crossRepoCopyService.copy(getNodeRef(), destRef, name);
-
+                  
+                  if (destRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
+                  {
+                      // ETHREEOH-2110
+                      AVMNodeDescriptor desc = getAvmService().lookup(-1, destPath + "/" + name);
+                      recursiveFormCheck(desc);
+                  }
+                  
                   // if we get here without an exception, the clipboard copy operation was successful
                   operationComplete = true;
                }
diff --git a/source/java/org/alfresco/web/bean/content/AddContentDialog.java b/source/java/org/alfresco/web/bean/content/AddContentDialog.java
index a779fddd5c..0d975b2bd9 100644
--- a/source/java/org/alfresco/web/bean/content/AddContentDialog.java
+++ b/source/java/org/alfresco/web/bean/content/AddContentDialog.java
@@ -44,6 +44,7 @@ import org.alfresco.config.ConfigService;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentReader;
+import org.alfresco.service.cmr.model.FileExistsException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
@@ -316,5 +317,22 @@ public class AddContentDialog extends BaseContentWizard
     
       return Application.getMessage(FacesContext.getCurrentInstance(), MSG_OK);
    }
+   
+   @Override
+   protected String formatErrorMessage(Throwable exception)
+   {
+      if (exception instanceof FileExistsException)
+      {
+         return MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS),
+               ((FileExistsException)exception).getName());
+      }
+      else
+      {
+         return MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), "error_content"),
+               exception.getMessage());
+      }
+   }
 
 }
diff --git a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
index 5a6b074e57..6dd4992e98 100644
--- a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
+++ b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
@@ -25,6 +25,7 @@
 package org.alfresco.web.bean.content;
 
 import java.io.Serializable;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -41,11 +42,13 @@ import org.alfresco.config.ConfigElement;
 import org.alfresco.config.ConfigService;
 import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.service.cmr.model.FileExistsException;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
 import org.alfresco.web.bean.repository.Node;
+import org.alfresco.web.bean.repository.Repository;
 import org.alfresco.web.data.IDataContainer;
 import org.alfresco.web.data.QuickSort;
 import org.alfresco.web.forms.Form;
@@ -391,4 +394,22 @@ public class CreateContentWizard extends BaseContentWizard
       // clear the content as HTML is not compatible with the plain text box etc.
       this.content = null;
    }
+   
+   @Override
+   protected String formatErrorMessage(Throwable exception)
+   {
+      if (exception instanceof FileExistsException)
+      {
+         return MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS),
+               ((FileExistsException)exception).getName());
+      }
+      else
+      {
+         return MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), "error_content"),
+               exception.getMessage());
+      }
+   }
+
 }
diff --git a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
index d25ecd8c7e..d95d5785d2 100644
--- a/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditFormWizard.java
@@ -244,6 +244,8 @@ public class EditFormWizard
             
             assert retd != null;
             assert retd.getNodeRef() != null;
+            this.getNodeService().removeAssociation(formNodeRef, retd.getNodeRef(), 
+                     WCMAppModel.ASSOC_RENDERING_ENGINE_TEMPLATES);
             this.getNodeService().removeChild(formNodeRef, retd.getNodeRef());
             this.removeRenderingEngineTemplateFromWebProjects(formNodeRef, retd);
 
diff --git a/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java b/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java
index 01c54195e9..52eb858efb 100644
--- a/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/PromptForWebFormDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,10 @@
  */
 package org.alfresco.web.bean.wcm;
 
+import java.io.Serializable;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +38,7 @@ import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.AlfrescoNavigationHandler;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.app.servlet.FacesHelper;
@@ -57,7 +60,7 @@ public class PromptForWebFormDialog extends BaseDialogBean
 {
    private static final long serialVersionUID = 8062203927131257236L;
 
-   private static final Log LOGGER = LogFactory.getLog(PromptForWebFormDialog.class);
+   private static final Log logger = LogFactory.getLog(PromptForWebFormDialog.class);
    
    /** AVM service reference */
    transient private AVMService avmService;
@@ -152,8 +155,12 @@ public class PromptForWebFormDialog extends BaseDialogBean
          {
             final Form f = fid.getForm();
             this.formName = f.getName();
-            // strange case... this should throw an exception if we're here... 
-            LOGGER.debug(avmPath + ".getForm() did not throw a form not found.  why are we here?");
+            
+            if (logger.isDebugEnabled())
+            {
+                // strange case... this should throw an exception if we're here... 
+                logger.debug(avmPath + ".getForm() did not throw a form not found.  why are we here?");
+            }
          }
          catch (final FormNotFoundException fnfe)
          {
@@ -178,19 +185,31 @@ public class PromptForWebFormDialog extends BaseDialogBean
    protected String finishImpl(final FacesContext context, String outcome)
       throws Exception
    {
-      LOGGER.debug("configuring " + this.getAvmNode().getPath() + 
-                   " to use form " + this.getFormName());
-
-      this.getAvmService().setNodeProperty(this.getAvmNode().getPath(),
-                                      WCMAppModel.PROP_PARENT_FORM_NAME,
-                                      new PropertyValue(DataTypeDefinition.TEXT, this.getFormName()));
-                                      
+      
+      if (logger.isDebugEnabled())
+      {
+         logger.debug("configuring " + this.getAvmNode().getPath() +
+                      " to use form " + this.getFormName());
+      }
+      
       if (!this.getAvmService().hasAspect(this.getAvmNode().getVersion(),
                                      this.getAvmNode().getPath(), 
                                      WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
       {
-         this.getAvmService().addAspect(this.getAvmNode().getPath(), WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
+         String cwd = AVMUtil.getCorrespondingPathInPreviewStore(this.avmBrowseBean.getCurrentPath());
+         
+         Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
+         props.put(WCMAppModel.PROP_PARENT_FORM_NAME, this.getFormName());
+         props.put(WCMAppModel.PROP_ORIGINAL_PARENT_PATH, cwd);
+         this.getNodeService().addAspect(this.getAvmNode().getNodeRef(), WCMAppModel.ASPECT_FORM_INSTANCE_DATA, props);
       }
+      else
+      {
+          this.getAvmService().setNodeProperty(this.getAvmNode().getPath(),
+                  WCMAppModel.PROP_PARENT_FORM_NAME,
+                  new PropertyValue(DataTypeDefinition.TEXT, this.getFormName()));
+      }
+      
       return outcome;
    }
       
diff --git a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
index 0eded318cb..c5c88b5c54 100644
--- a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
+++ b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -283,8 +283,11 @@ public class RenderingEngineTemplateImpl
       RenderingEngine.RenderingException
    {
       final AVMService avmService = this.getServiceRegistry().getAVMLockingAwareService();
-      final boolean isRegenerate = avmService.lookup(-1, renditionAvmPath) != null;
-      if (!isRegenerate)
+      
+      boolean isRegenerate = true;
+      boolean exists = avmService.lookup(-1, renditionAvmPath) != null;
+      
+      if (! exists)
       {
          final String parentAVMPath = AVMNodeConverter.SplitBase(renditionAvmPath)[0];
          AVMUtil.makeAllDirectories(parentAVMPath);
@@ -292,18 +295,30 @@ public class RenderingEngineTemplateImpl
                                AVMNodeConverter.SplitBase(renditionAvmPath)[1]);
          
          if (LOGGER.isDebugEnabled())
+         {
             LOGGER.debug("Created file node for file: " + renditionAvmPath);
-
-         avmService.addAspect(renditionAvmPath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
+         }
+         
          avmService.addAspect(renditionAvmPath, ContentModel.ASPECT_TITLED);
          avmService.addAspect(renditionAvmPath, WCMAppModel.ASPECT_RENDITION);
+         
+         isRegenerate = false;
       }
-
+      else
+      {
+          // ETHREEOH-2110
+          if (! avmService.hasAspect(-1, renditionAvmPath, WCMAppModel.ASPECT_RENDITION))
+          {
+              avmService.addAspect(renditionAvmPath, WCMAppModel.ASPECT_RENDITION);
+              isRegenerate = false;
+          }
+      }
+      
       final Rendition result = new RenditionImpl(-1, 
                                                  renditionAvmPath,
                                                  this.getFormsService());
       this.render(formInstanceData, result);
-
+      
       if (!isRegenerate)
       {
          final PropertyValue pv = 
diff --git a/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java b/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
index c5216ab8cc..b9de6648b3 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIGenericPicker.java
@@ -371,7 +371,8 @@ public class UIGenericPicker extends UICommand
       
       // results list row
       out.write("<tr><td colspan=2>");
-      out.write("<select size='8' style='min-width:");
+      out.write("<select size='8' style='");
+      out.write((currentResults != null && currentResults.length != 0) ? "min-width:" : "width:");
       out.write(Integer.toString(getWidth()));
       out.write("px;height:");
       out.write(Integer.toString(getHeight()));
diff --git a/source/web/jsp/actions/actions.jsp b/source/web/jsp/actions/actions.jsp
index 280d06b27b..cf222af538 100644
--- a/source/web/jsp/actions/actions.jsp
+++ b/source/web/jsp/actions/actions.jsp
@@ -42,19 +42,19 @@
          
       // also check to see if a no parameters option has been selected, if it has, change
       // the explanation text and the button label
-      var short_text = "</f:verbatim><a:outputText value='#{msg.click_add_to_list}' /><f:verbatim>";
-      var long_text = "</f:verbatim><a:outputText value='#{msg.click_set_and_add}' /><f:verbatim>";
-      var short_label = "</f:verbatim><a:outputText value='#{msg.add_to_list_button}' encodeForJavaScript='true' /><f:verbatim>";
-      var long_label = "</f:verbatim><a:outputText value='#{msg.set_and_add_button}' encodeForJavaScript='true' /><f:verbatim>";
+      var short_text = "</f:verbatim><h:outputText value='#{msg.click_add_to_list}' /><f:verbatim>";
+      var long_text = "</f:verbatim><h:outputText value='#{msg.click_set_and_add}' /><f:verbatim>";
+      var short_label = "</f:verbatim><h:outputText value='#{msg.add_to_list_button}' /><f:verbatim>";
+      var long_label = "</f:verbatim><h:outputText value='#{msg.set_and_add_button}'  /><f:verbatim>";
       
       if (inputField.value == "no-condition")
       {
-         document.getElementById("wizard:wizard-body:set-add-button").value = unescape(short_label);
+         document.getElementById("wizard:wizard-body:set-add-button").value = short_label;
          document.getElementById("wizard:wizard-body:instruction-text").innerHTML = short_text;
       }
       else
       {
-         document.getElementById("wizard:wizard-body:set-add-button").value = unescape(long_label);
+         document.getElementById("wizard:wizard-body:set-add-button").value = long_label;
          document.getElementById("wizard:wizard-body:instruction-text").innerHTML = long_text;
       }
    }
diff --git a/source/web/jsp/content/add-content-dialog.jsp b/source/web/jsp/content/add-content-dialog.jsp
index f7645aec1f..8389a93328 100644
--- a/source/web/jsp/content/add-content-dialog.jsp
+++ b/source/web/jsp/content/add-content-dialog.jsp
@@ -207,7 +207,7 @@ if (fileUploaded)
          {
             finishButtonPressed = false;
             return validateName(document.getElementById("dialog:dialog-body:file-name"),
-                                unescape('</f:verbatim><a:outputText id="text11" value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'), true);
+                                unescape('</f:verbatim><h:outputText id="text11" value="#{msg.validation_invalid_character}" /><f:verbatim>'), true);
          }
          else
          {
diff --git a/source/web/jsp/content/create-content-wizard/details.jsp b/source/web/jsp/content/create-content-wizard/details.jsp
index 866b26ebd1..402a7382f7 100644
--- a/source/web/jsp/content/create-content-wizard/details.jsp
+++ b/source/web/jsp/content/create-content-wizard/details.jsp
@@ -62,7 +62,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("wizard:wizard-body:file-name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/forums/create-dialog.jsp b/source/web/jsp/forums/create-dialog.jsp
index 1d4504c931..314240d2f2 100644
--- a/source/web/jsp/forums/create-dialog.jsp
+++ b/source/web/jsp/forums/create-dialog.jsp
@@ -61,7 +61,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("dialog:dialog-body:name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}"  /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/forums/create-topic-dialog.jsp b/source/web/jsp/forums/create-topic-dialog.jsp
index e84e694aa7..eb4392b778 100644
--- a/source/web/jsp/forums/create-topic-dialog.jsp
+++ b/source/web/jsp/forums/create-topic-dialog.jsp
@@ -62,7 +62,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("dialog:dialog-body:name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/ml/add-translation-dialog.jsp b/source/web/jsp/ml/add-translation-dialog.jsp
index 26fe863487..dceac98ca2 100644
--- a/source/web/jsp/ml/add-translation-dialog.jsp
+++ b/source/web/jsp/ml/add-translation-dialog.jsp
@@ -214,7 +214,7 @@
          {
             finishButtonPressed = false;
             return validateName(document.getElementById("dialog:dialog-body:file-name"),
-                                unescape('</f:verbatim><a:outputText id="text11" value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'), true);
+                                unescape('</f:verbatim><h:outputText id="text11" value="#{msg.validation_invalid_character}" /><f:verbatim>'), true);
          }
          else
          {
diff --git a/source/web/jsp/rules/composite-condition.jsp b/source/web/jsp/rules/composite-condition.jsp
index 434aad7ad3..23b2172949 100644
--- a/source/web/jsp/rules/composite-condition.jsp
+++ b/source/web/jsp/rules/composite-condition.jsp
@@ -56,19 +56,19 @@
       
       // also check to see if the 'no-condition' option has been selected, if it has, change
       // the explanation text and the button label
-      var short_text = "<a:outputText value='#{msg.click_add_to_list}' />";
-      var long_text = "<a:outputText value='#{msg.click_set_and_add}' />";
-      var short_label = "<a:outputText value='#{msg.add_to_list_button}' encodeForJavaScript='true' />";
-      var long_label = "<a:outputText value='#{msg.set_and_add_button}' encodeForJavaScript='true' />";
+      var short_text = "<h:outputText value='#{msg.click_add_to_list}' />";
+      var long_text = "<h:outputText value='#{msg.click_set_and_add}' />";
+      var short_label = "<h:outputText value='#{msg.add_to_list_button}' />";
+      var long_label = "<h:outputText value='#{msg.set_and_add_button}' />";
       
       if (inputField.value == "no-condition")
       {
-         document.getElementById("composite-condition:set-add-button").value = unescape(short_label);
+         document.getElementById("composite-condition:set-add-button").value = short_label;
          document.getElementById("composite-condition:instruction-text").innerHTML = short_text;
       }
       else
       {
-         document.getElementById("composite-condition:set-add-button").value = unescape(long_label);
+         document.getElementById("composite-condition:set-add-button").value = long_label;
          document.getElementById("composite-condition:instruction-text").innerHTML = long_text;
       }
    }
diff --git a/source/web/jsp/rules/conditions.jsp b/source/web/jsp/rules/conditions.jsp
index 860358fa0b..619df4414c 100644
--- a/source/web/jsp/rules/conditions.jsp
+++ b/source/web/jsp/rules/conditions.jsp
@@ -42,19 +42,19 @@
       
       // also check to see if the 'no-condition' option has been selected, if it has, change
       // the explanation text and the button label
-      var short_text = "</f:verbatim><a:outputText value='#{msg.click_add_to_list}' /><f:verbatim>";
-      var long_text = "</f:verbatim><a:outputText value='#{msg.click_set_and_add}' /><f:verbatim>";
-      var short_label = "</f:verbatim><a:outputText value='#{msg.add_to_list_button}' encodeForJavaScript='true' /><f:verbatim>";
-      var long_label = "</f:verbatim><a:outputText value='#{msg.set_and_add_button}' encodeForJavaScript='true' /><f:verbatim>";
+      var short_text = "</f:verbatim><h:outputText value='#{msg.click_add_to_list}' /><f:verbatim>";
+      var long_text = "</f:verbatim><h:outputText value='#{msg.click_set_and_add}' /><f:verbatim>";
+      var short_label = "</f:verbatim><h:outputText value='#{msg.add_to_list_button}' /><f:verbatim>";
+      var long_label = "</f:verbatim><h:outputText value='#{msg.set_and_add_button}' /><f:verbatim>";
       
       if (inputField.value == "no-condition")
       {
-         document.getElementById("wizard:wizard-body:set-add-button").value = unescape(short_label);
+         document.getElementById("wizard:wizard-body:set-add-button").value = short_label;
          document.getElementById("wizard:wizard-body:instruction-text").innerHTML = short_text;
       }
       else
       {
-         document.getElementById("wizard:wizard-body:set-add-button").value = unescape(long_label);
+         document.getElementById("wizard:wizard-body:set-add-button").value = long_label;
          document.getElementById("wizard:wizard-body:instruction-text").innerHTML = long_text;
       }
    }
diff --git a/source/web/jsp/spaces/create-space-dialog.jsp b/source/web/jsp/spaces/create-space-dialog.jsp
index 412d820062..bcbd83e1df 100644
--- a/source/web/jsp/spaces/create-space-dialog.jsp
+++ b/source/web/jsp/spaces/create-space-dialog.jsp
@@ -61,7 +61,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("dialog:dialog-body:name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}"  /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/spaces/create-space-wizard/details.jsp b/source/web/jsp/spaces/create-space-wizard/details.jsp
index 7c43b0f863..093da9369d 100644
--- a/source/web/jsp/spaces/create-space-wizard/details.jsp
+++ b/source/web/jsp/spaces/create-space-wizard/details.jsp
@@ -84,7 +84,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("wizard:wizard-body:name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/wcm/add-content-dialog.jsp b/source/web/jsp/wcm/add-content-dialog.jsp
index 6d6d84090e..683b9ada5b 100644
--- a/source/web/jsp/wcm/add-content-dialog.jsp
+++ b/source/web/jsp/wcm/add-content-dialog.jsp
@@ -197,7 +197,7 @@
          {
             finishButtonPressed = false;
             return validateName(document.getElementById("dialog:dialog-body:file-name"), 
-                                unescape('</f:verbatim><a:outputText id="text11" value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'), true);
+                                unescape('</f:verbatim><h:outputText id="text11" value="#{msg.validation_invalid_character}" /><f:verbatim>'), true);
          }
          else
          {
diff --git a/source/web/jsp/wcm/create-folder-dialog.jsp b/source/web/jsp/wcm/create-folder-dialog.jsp
index 75461fe667..9335af6a6e 100644
--- a/source/web/jsp/wcm/create-folder-dialog.jsp
+++ b/source/web/jsp/wcm/create-folder-dialog.jsp
@@ -60,7 +60,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("dialog:dialog-body:name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/wcm/create-web-content-wizard/details.jsp b/source/web/jsp/wcm/create-web-content-wizard/details.jsp
index 85850f948b..017bc7308e 100644
--- a/source/web/jsp/wcm/create-web-content-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-web-content-wizard/details.jsp
@@ -62,7 +62,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("wizard:wizard-body:file-name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}"  /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/wcm/create-webapp.jsp b/source/web/jsp/wcm/create-webapp.jsp
index c3bab6f5c3..7704ed88f4 100644
--- a/source/web/jsp/wcm/create-webapp.jsp
+++ b/source/web/jsp/wcm/create-webapp.jsp
@@ -60,7 +60,7 @@
       {
          finishButtonPressed = false;
          return validateName(document.getElementById("dialog:dialog-body:name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>'),
                              true);
       }
       else
diff --git a/source/web/jsp/wcm/create-website-wizard/details.jsp b/source/web/jsp/wcm/create-website-wizard/details.jsp
index 883307f37a..afffcb7555 100644
--- a/source/web/jsp/wcm/create-website-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/details.jsp
@@ -64,7 +64,7 @@
       {
          finishButtonPressed = false;
          var valid = validateName(document.getElementById("wizard:wizard-body:name"), 
-                             unescape('</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" encodeForJavaScript="true" /><f:verbatim>'),
+                             unescape('</f:verbatim><h:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>'),
                              true);
          if (valid == true)
          {
diff --git a/source/web/scripts/office/office_addin.js b/source/web/scripts/office/office_addin.js
index 82c14e4a1e..53a7a1261f 100644
--- a/source/web/scripts/office/office_addin.js
+++ b/source/web/scripts/office/office_addin.js
@@ -259,4 +259,33 @@ var OfficeAddin =
    }
 };
 
-window.addEvent('domready', OfficeAddin.init);
\ No newline at end of file
+function htmlWordWrap(elementId, lineWidth, sentence)
+{
+   if(!elementId || (elementId.length < 1) || !sentence || (sentence.length < 1) || (lineWidth <= 0))
+   {
+      return;
+   }
+
+   var result = "";
+   var i = 0;
+
+   for(; (sentence.length - i) >= lineWidth; i += lineWidth)
+   {
+      result += sentence.substr(i, lineWidth) + "<br />";
+   }
+   if((sentence.length - i) > 0)
+   {
+      result += sentence.substr(i, (sentence.length - i));
+   }
+   else
+   {
+      result = result.substr(0, (result.length - 6));
+   }
+   var nameElement = document.getElementById(elementId);
+   if(undefined != nameElement)
+   {
+      nameElement.innerHTML = result;
+   }
+}
+
+window.addEvent('domready', OfficeAddin.init);