diff --git a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
index 847e7aa3b4..5b0c51151e 100644
--- a/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
+++ b/source/java/org/alfresco/web/bean/DocumentDetailsBean.java
@@ -32,6 +32,7 @@ import javax.transaction.UserTransaction;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.lock.LockService;
 import org.alfresco.service.cmr.repository.ContentData;
@@ -226,6 +227,14 @@ public class DocumentDetailsBean
       return getDocument().hasAspect(ContentModel.ASPECT_INLINEEDITABLE);
    }
    
+   /**
+    * @return true if the Document has a discussion attached to it
+    */
+   public boolean isBeingDiscussed()
+   {
+      return getDocument().hasAspect(ForumModel.ASPECT_DISCUSSABLE);
+   }
+   
    /**
     * Returns a list of objects representing the versions of the 
     * current document 
diff --git a/source/java/org/alfresco/web/bean/SpaceDetailsBean.java b/source/java/org/alfresco/web/bean/SpaceDetailsBean.java
index a6de8163f2..511395d6b6 100644
--- a/source/java/org/alfresco/web/bean/SpaceDetailsBean.java
+++ b/source/java/org/alfresco/web/bean/SpaceDetailsBean.java
@@ -27,6 +27,7 @@ import javax.faces.event.ActionEvent;
 import javax.faces.model.SelectItem;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.model.ForumModel;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -136,6 +137,14 @@ public class SpaceDetailsBean
       return getSpace().getName();
    }
    
+   /**
+    * @return true if the Space has a discussion attached to it
+    */
+   public boolean isBeingDiscussed()
+   {
+      return getSpace().hasAspect(ForumModel.ASPECT_DISCUSSABLE);
+   }
+   
    /**
     * Returns the WebDAV URL for the current space
     * 
diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml
index 819cafe55d..cc7646e638 100644
--- a/source/web/WEB-INF/faces-config-navigation.xml
+++ b/source/web/WEB-INF/faces-config-navigation.xml
@@ -275,6 +275,14 @@
          <from-outcome>applyTemplate</from-outcome>
          <to-view-id>/jsp/dialog/apply-template.jsp</to-view-id>
       </navigation-case>
+      <navigation-case>
+         <from-outcome>previewSpace</from-outcome>
+         <to-view-id>/jsp/dialog/preview-space.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showForum</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
    </navigation-rule>
    
    <navigation-rule>
@@ -347,6 +355,14 @@
          <from-outcome>previousItem</from-outcome>
          <to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
       </navigation-case>
+      <navigation-case>
+         <from-outcome>previewContent</from-outcome>
+         <to-view-id>/jsp/dialog/preview-file.jsp</to-view-id>
+      </navigation-case>
+      <navigation-case>
+         <from-outcome>showForum</from-outcome>
+         <to-view-id>/jsp/forums/forum.jsp</to-view-id>
+      </navigation-case>
    </navigation-rule>
    
    <navigation-rule>
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index 611f746037..0c99bb3f36 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -169,6 +169,25 @@
                                     <f:param name="id" value="#{DocumentDetailsBean.id}" />
                                  </a:actionLink>
                                  
+                                 <%-- discussion --%>
+                                 <a:booleanEvaluator value="#{DocumentDetailsBean.beingDiscussed == true}">
+                                    <a:actionLink value="#{msg.discuss}" image="/images/icons/forum.gif" actionListener="#{ForumsBean.discuss}">
+                                       <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                                 <a:booleanEvaluator value="#{DocumentDetailsBean.beingDiscussed == false}">
+                                    <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="CreateChildren">
+   	                                 <a:actionLink value="#{msg.start_discussion}" image="/images/icons/create_forum.gif" actionListener="#{CreateDiscussionDialog.startWizard}">
+   	                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+   	                                 </a:actionLink>
+                                    </r:permissionEvaluator>
+                                 </a:booleanEvaluator>
+                                 
+                                 <%-- preview in template --%>
+                                 <a:actionLink value="#{msg.preview}" image="/images/icons/preview.gif" actionListener="#{BrowseBean.setupContentAction}" action="previewContent">
+                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                 </a:actionLink>
+                                 
                                  <%-- custom action --%>
                                  <a:actionLink value="#{msg.other_action}" image="/images/icons/action.gif" action="createAction" actionListener="#{NewActionWizard.startWizard}" />
                               </a:menu>
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
index f200c88823..fe7f013dc1 100644
--- a/source/web/jsp/dialog/space-details.jsp
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -84,31 +84,54 @@
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
                               </r:permissionEvaluator>
+                              
                               <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
+                              
                               <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
                                  <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
                               </r:permissionEvaluator>
+                              
                               <a:menu itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
                                  <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
                                     <a:actionLink value="#{msg.import}" image="/images/icons/import.gif" action="dialog:import" actionListener="#{BrowseBean.setupSpaceAction}">
                                        <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                     </a:actionLink>
                                  </r:permissionEvaluator>
+                                 
                                  <a:actionLink value="#{msg.export}" image="/images/icons/export.gif" action="dialog:export" actionListener="#{BrowseBean.setupSpaceAction}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
+                                 
                                  <a:actionLink value="#{msg.create_shortcut}" image="/images/icons/shortcut.gif" actionListener="#{UserShortcutsBean.createShortcut}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
+                                 
                                  <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="ChangePermissions">
                                     <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" action="manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
                                        <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                     </a:actionLink>
                                  </r:permissionEvaluator>
+                                 
+                                 <a:booleanEvaluator value="#{SpaceDetailsBean.beingDiscussed == true}">
+                                    <a:actionLink value="#{msg.discuss}" image="/images/icons/forum.gif" actionListener="#{ForumsBean.discuss}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                                 <a:booleanEvaluator value="#{SpaceDetailsBean.beingDiscussed == false}">
+                                    <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="CreateChildren">
+   	                                 <a:actionLink value="#{msg.start_discussion}" image="/images/icons/create_forum.gif" actionListener="#{CreateDiscussionDialog.startWizard}">
+   	                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+   	                                 </a:actionLink>
+                                    </r:permissionEvaluator>
+                                 </a:booleanEvaluator>
+                                 
+                                 <a:actionLink value="#{msg.preview}" image="/images/icons/preview.gif" actionListener="#{BrowseBean.setupSpaceAction}" action="previewSpace">
+                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                 </a:actionLink>
                               </a:menu>
                            </td>