diff --git a/config/alfresco/messages/webclient_es.properties b/config/alfresco/messages/webclient_es.properties
index a8e4a8fbac..177d078b55 100755
--- a/config/alfresco/messages/webclient_es.properties
+++ b/config/alfresco/messages/webclient_es.properties
@@ -731,7 +731,7 @@ undo_checkout=Deshacer bloqueo
 undo_checkout_info=Si deshace el bloqueo de un documento, se eliminar\u00e1 la copia de trabajo asociada y se perder\u00e1n todos los cambios efectuados en ella desde el Bloqueo.
 cancel_editing_for=Cancelar edici\u00f3n para 
 cancel_editing_info=\u00bfEst\u00e1 seguro de que quiere cancelar la edici\u00f3n? Se perder\u00e1n todos los cambios en la copia de trabajo.
-complete=complete
+complete=completado
 working_copy_for=Copia de trabajo para
 working_copy_missing_info=La copia de trabajo ya no est\u00e1 disponible. Esto podr\u00eda ser consecuencia de la(s) regla(s) activa(s) aplicadas al espacio que usted ha bloqueado.
 
@@ -904,7 +904,7 @@ create_form_form_details_desc=Introduzca informaci\u00f3n sobre el formulario qu
 create_form_form_details_step1_desc=Seleccione el esquema XML a utilizar
 create_form_form_details_step2_desc=Especifique los detalles para el nuevo formulario.
 create_form_form_details_no_elements_in_schema=Este esquema no contiene declaraciones de elementos.  Un esquema debe contener al menos una declaraci\u00f3n de elemento para generar un formulario.
-create_form_form_details_no_schema_selected=<no schema selected>
+create_form_form_details_no_schema_selected=<No hay esquemas seleccionados>
 create_form_form_details_associated_web_projects=Actualmente este formulario est\u00e1 configurado para los siguientes proyectos Web:
 create_form_configure_rendering_engine_templates_title=Configurar plantillas
 create_form_configure_rendering_engine_templates_step_title=Segundo paso - Configurar plantillas
diff --git a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
index 4f2133ec00..6e3a180830 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
@@ -384,18 +384,12 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
 
    private void setHeaderContentDisposition(HttpServletRequest req, HttpServletResponse res, String filename)
    {
-       // set header based on filename - will force a Save As from the browse if it doesn't recognise it
-       // this is better than the default response of the browser trying to display the contents
+      // set header based on filename - will force a Save As from the browse if it doesn't recognise it
+      // this is better than the default response of the browser trying to display the contents
 
-       // IE requires that "Content-Disposition" header in case of "attachment" type should include
-       // "filename" part.
-       StringBuilder attachmentValue = new StringBuilder(128).append("attachment");
-       String userAgent = req.getHeader(HEADER_USER_AGENT);
-       if (userAgent != null && userAgent.toLowerCase().contains("msie"))
-       {
-           attachmentValue.append("; filename=\"").append(res.encodeURL(filename)).append("\"");
-       }
-       res.setHeader(HEADER_CONTENT_DISPOSITION, attachmentValue.toString());
+      // IE requires that "Content-Disposition" header in case of "attachment" type should include
+      // "filename" part. Should be harmless in other browsers.
+      res.setHeader(HEADER_CONTENT_DISPOSITION, "attachment; filename=\"" + URLEncoder.encode(filename)+ "\"");
    }
       
    /**