diff --git a/source/java/org/alfresco/web/bean/wizard/NewPostWizard.java b/source/java/org/alfresco/web/bean/wizard/NewPostWizard.java
index b0d9ff1f7f..f16a8782c8 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewPostWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewPostWizard.java
@@ -22,6 +22,7 @@ import javax.faces.context.FacesContext;
 import org.alfresco.model.ForumModel;
 import org.alfresco.util.GUID;
 import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.ui.common.Utils;
 
 /**
  * Backing bean for posting forum articles.
@@ -55,6 +56,9 @@ public class NewPostWizard extends CreateContentWizard
                   FacesContext.getCurrentInstance(), this.fileName);
       this.title = this.fileName;
       
+      // remove link breaks and replace with <br/>
+      this.content = Utils.replaceLineBreaks(this.content);
+      
       return super.finish();
    }
    
diff --git a/source/java/org/alfresco/web/bean/wizard/NewReplyWizard.java b/source/java/org/alfresco/web/bean/wizard/NewReplyWizard.java
index d7b150157d..c0166f4b70 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewReplyWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewReplyWizard.java
@@ -20,6 +20,7 @@ package org.alfresco.web.bean.wizard;
 import javax.faces.event.ActionEvent;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -44,7 +45,19 @@ public class NewReplyWizard extends NewPostWizard
       // also setup the content in the browse bean
       this.browseBean.setupContentAction(event);
    }
-   
+
+   /**
+    * @see org.alfresco.web.bean.wizard.AbstractWizardBean#finish()
+    */
+   @Override
+   public String finish()
+   {
+      // remove link breaks and replace with <br/>
+      this.content = Utils.replaceLineBreaks(this.content);
+      
+      return super.finish();
+   }
+
    /**
     * @see org.alfresco.web.bean.wizard.BaseContentWizard#performCustomProcessing()
     */