diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 17f07b18a4..f1d41d9697 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -402,7 +402,7 @@ automatic_text=Automatic text
 invite_space=You have been invited to ''{0}'' by {1}.
 invite_role=You will have the role of: {0}
 invite_finish_instruction=To close this wizard and apply your changes click Finish. To review or change your selections click Back.
-remove_invited_user_info=Remove an invited user from this space.
+remove_invited_user_info=To remove an invited user from this space, click Yes.
 add_role=Add Role
 space_owner=User ''{0}'' is the current owner of this space.
 users_and_groups=Users and Groups
@@ -882,22 +882,22 @@ error_export_all=Please correct the export errors below then click OK.
 
 # Confirmations
 return_to_application=Return to application
-delete_space_info=To remove this space and all of its contents, click Delete.
+delete_space_info=To remove this space and all of its contents, click Yes.
 delete_space_confirm=Are you sure you want to delete \"{0}\" and all its contents?
-delete_forums_info=To remove this forum space and its contents, click Delete.
-delete_forum_info=To remove this forum and its topics, click Delete.
+delete_forums_info=To remove this forum space and its contents, click Yes.
+delete_forum_info=To remove this forum and its topics, click Yes.
 delete_forum_confirm=Are you sure you want to delete \"{0}\" and all its topics?
-delete_topic_info=To remove this topic and its posts, click Delete.
+delete_topic_info=To remove this topic and its posts, click Yes.
 delete_topic_confirm=Are you sure you want to delete \"{0}\" and all its posts?
-delete_post_info=To remove this post, click Delete.
-delete_post_confirm=Are you sure you want to delete \"{0}\"?
-delete_file_info=To remove this file and any previous versions, click Delete.
+delete_post_info=To remove this post, click Yes.
+delete_post_confirm=Are you sure you want to delete the post from \"{0}\"?
+delete_file_info=To remove this file and any previous versions, click Yes.
 delete_file_confirm=Are you sure you want to delete \"{0}\" and all previous versions?
-delete_rule_info=To remove this rule, click Delete.
-delete_user_info=To delete this user, click Delete.
+delete_rule_info=To remove this rule, click Yes.
+delete_user_info=To delete this user, click Yes.
 delete_rule_confirm=Are you sure you want to delete \"{0}\"?
-delete_user_confirm=Are you sure you want to delete user \"{0}\"? The User will no longer be able to access the system.
-remove_invited_user_confirm=Are you sure you want to remove user \"{0}\"? The User will no longer be able to access the documents and folders in this space.
+delete_user_confirm=The User will no longer be able to access the system. Are you sure you want to delete user \"{0}\"? 
+remove_invited_user_confirm=The User will no longer be able to access the documents and folders in this space. Are you sure you want to remove user \"{0}\"?
 delete_companyroot_confirm=WARNING: This folder is a special folder accessed by all Users! Please be sure that you wish to delete this folder. It may cause System Errors if you remove it.
 
 # Status Messages
diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index 999147d0c0..5702004ec5 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -1098,7 +1098,8 @@ public class BrowseBean implements IContextListener
       // clear the UI state in preparation for finishing the next action
       if (invalidate == true)
       {
-         invalidateComponents();
+         // use the context service to notify all registered beans
+         UIContextService.getInstance(FacesContext.getCurrentInstance()).notifyBeans();
       }
    }
    
diff --git a/source/java/org/alfresco/web/bean/wizard/NewTopicWizard.java b/source/java/org/alfresco/web/bean/wizard/NewTopicWizard.java
index 42281ee6ae..c81f48c621 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewTopicWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewTopicWizard.java
@@ -36,6 +36,7 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.GUID;
 import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIListItem;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -192,7 +193,7 @@ public class NewTopicWizard extends NewSpaceWizard
          // set the mimetype and encoding
          writer.setMimetype(Repository.getMimeTypeForFileName(context, fileName));
          writer.setEncoding("UTF-8");
-         writer.putContent(this.message);
+         writer.putContent(Utils.replaceLineBreaks(this.message));
       }
    }
 }
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index a1d6753c56..48d6941a3c 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -16,7 +16,9 @@
  */
 package org.alfresco.web.ui.common;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.StringReader;
 import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -278,6 +280,43 @@ public final class Utils
       return out.append(str.substring(lastindex, str.length())).toString();
    }
    
+   /**
+    * Replaces carriage returns and line breaks with the <br> tag.
+    * 
+    * @param str The string to be parsed
+    * @return The string with line breaks removed
+    */
+   public static String replaceLineBreaks(String str)
+   {
+      String replaced = null;
+      
+      if (str != null)
+      {
+         try
+         {
+            StringBuilder parsedContent = new StringBuilder();
+            BufferedReader reader = new BufferedReader(new StringReader(str));
+            String line = reader.readLine();
+            while (line != null)
+            {
+               parsedContent.append(line).append("<br/>");
+               line = reader.readLine();
+            }
+            
+            replaced = parsedContent.toString();
+         }
+         catch (IOException ioe)
+         {
+            if (logger.isWarnEnabled())
+            {
+               logger.warn("Failed to replace line breaks in string: " + str);
+            }
+         }
+      }
+      
+      return replaced;
+   }
+   
    /**
     * Helper to output an attribute to the output stream
     * 
diff --git a/source/web/jsp/forums/delete-post.jsp b/source/web/jsp/forums/delete-post.jsp
index cec9e0b1e8..8ceb636834 100644
--- a/source/web/jsp/forums/delete-post.jsp
+++ b/source/web/jsp/forums/delete-post.jsp
@@ -71,7 +71,7 @@
                            </td>
                            <td>
                               <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
-                              <div class="mainTitle"><h:outputText value="#{msg.delete_post}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
+                              <div class="mainTitle"><h:outputText value="#{msg.delete_post}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_post_info}" /></div>
                            </td>
                         </tr>
@@ -117,7 +117,7 @@
                                  <tr>
                                     <td class="mainSubTitle">
                                        <h:outputFormat value="#{msg.delete_post_confirm}">
-                                          <f:param value="#{BrowseBean.actionSpace.name}"/>
+                                          <f:param value="#{BrowseBean.document.properties.creator}"/>
                                        </h:outputFormat>
                                     </td>
                                  </tr>
@@ -137,7 +137,7 @@
                               <table cellpadding="1" cellspacing="1" border="0">
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteSpaceOK}" styleClass="dialogControls" />
+                                       <h:commandButton value="#{msg.yes}" action="#{BrowseBean.deleteFileOK}" styleClass="dialogControls" />
                                     </td>
                                  </tr>
                                  <tr><td class="dialogButtonSpacing"></td></tr>
diff --git a/source/web/jsp/forums/topic.jsp b/source/web/jsp/forums/topic.jsp
index d4a9868c39..f005290fda 100644
--- a/source/web/jsp/forums/topic.jsp
+++ b/source/web/jsp/forums/topic.jsp
@@ -88,7 +88,7 @@
                                  </a:actionLink>
                                  <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval2">
                                     <a:actionLink value="#{msg.delete_topic}" image="/images/icons/delete.gif" padding="4" action="deleteTopic" actionListener="#{BrowseBean.setupDeleteAction}" id="link3">
-                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
                                     </a:actionLink>
                                  </r:permissionEvaluator>
                                  <%-- Current space More actions menu --%>
@@ -160,7 +160,7 @@
                            <f:facet name="header">
                               <h:outputText value="#{msg.post}" />
                            </f:facet>
-                           <h:outputText value="#{r.message}" />
+                           <h:outputText value="#{r.message}" escape="false" />
                         </a:column>
                         
                         <%-- Author column for the details view mode --%>
@@ -227,7 +227,7 @@
                               </a:actionLink>
                            </r:permissionEvaluator>
                            <r:permissionEvaluator value="#{r}" allow="Delete">
-                              <a:actionLink value="#{msg.delete_post}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deletePost" actionListener="#{BrowseBean.setupDeleteAction}">
+                              <a:actionLink value="#{msg.delete_post}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deletePost" actionListener="#{BrowseBean.setupContentAction}">
                                  <f:param name="id" value="#{r.id}" />
                               </a:actionLink>
                            </r:permissionEvaluator>
diff --git a/source/web/jsp/roles/remove-invited-user.jsp b/source/web/jsp/roles/remove-invited-user.jsp
index 1723c631a4..7c61806042 100644
--- a/source/web/jsp/roles/remove-invited-user.jsp
+++ b/source/web/jsp/roles/remove-invited-user.jsp
@@ -121,13 +121,13 @@
                               <table cellpadding="1" cellspacing="1" border="0">
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.remove}" action="#{UserMembersBean.removeOK}" styleClass="dialogControls" />
+                                       <h:commandButton value="#{msg.yes}" action="#{UserMembersBean.removeOK}" styleClass="dialogControls" />
                                     </td>
                                  </tr>
                                  <tr><td class="dialogButtonSpacing"></td></tr>
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.cancel}" action="cancel" styleClass="dialogControls" />
+                                       <h:commandButton value="#{msg.no}" action="cancel" styleClass="dialogControls" />
                                     </td>
                                  </tr>
                               </table>
diff --git a/source/web/jsp/users/delete-user.jsp b/source/web/jsp/users/delete-user.jsp
index b150e4c600..10471fc164 100644
--- a/source/web/jsp/users/delete-user.jsp
+++ b/source/web/jsp/users/delete-user.jsp
@@ -121,13 +121,13 @@
                               <table cellpadding="1" cellspacing="1" border="0">
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.delete}" action="#{UsersBean.deleteOK}" styleClass="dialogControls" />
+                                       <h:commandButton value="#{msg.yes}" action="#{UsersBean.deleteOK}" styleClass="dialogControls" />
                                     </td>
                                  </tr>
                                  <tr><td class="dialogButtonSpacing"></td></tr>
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.cancel}" action="manageUsers" styleClass="dialogControls" />
+                                       <h:commandButton value="#{msg.no}" action="manageUsers" styleClass="dialogControls" />
                                     </td>
                                  </tr>
                               </table>