diff --git a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
index bcdd9599f1..2e9275903e 100644
--- a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
@@ -30,7 +30,10 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.transaction.TransactionService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -87,7 +90,7 @@ public class DownloadContentServlet extends BaseDownloadContentServlet
    /**
     * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
     */
-   protected void doGet(HttpServletRequest req, HttpServletResponse res)
+   protected void doGet(final HttpServletRequest req, final HttpServletResponse res)
       throws ServletException, IOException
    {
       if (logger.isDebugEnabled())
@@ -103,7 +106,17 @@ public class DownloadContentServlet extends BaseDownloadContentServlet
          return;
       }
       
-      processDownloadRequest(req, res, true);
+      ServiceRegistry serviceRegistry = getServiceRegistry(getServletContext());
+      TransactionService transactionService = serviceRegistry.getTransactionService();
+      RetryingTransactionCallback<Void> processCallback = new RetryingTransactionCallback<Void>()
+      {
+         public Void execute() throws Throwable
+         {
+             processDownloadRequest(req, res, true);
+             return null;
+         }
+      };
+      transactionService.getRetryingTransactionHelper().doInTransaction(processCallback, true);
    }
    
    /**
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index 54164d1da2..ba9a89c9ac 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -4826,6 +4826,7 @@ alfresco.constants.TINY_MCE_DEFAULT_SETTINGS =
   height: -1,
   auto_resize: false,
   force_p_newlines: false,
+  forced_root_block: false,
   encoding: "UTF-8",
   entity_encoding: "raw",
   add_unload_trigger: false,