diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
index a6d059c..2a097d6 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
@@ -26,7 +26,7 @@ function getSubmitSuccessPage($iDocumentID){
  *
  *	@param $sHeading -> text heading for the page
  */
-/*function renderHeading($sHeading) {
+function renderHeading($sHeading) {
     global $default;
         
     $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
@@ -37,7 +37,7 @@ function getSubmitSuccessPage($iDocumentID){
     $sToRender .= "<tr/>\n";
     $sToRender .= "</table>\n";
     return $sToRender;
-}*/
+}
 
 /** 
  *	Renders the path for the document
@@ -69,16 +69,15 @@ function getAddComment($fDocumentID, $sSubject, $sBody, $iCommentID, $fNewCommen
 	$sToRender .= renderHeading($sHeading);
 	$sToRender .= renderDocumentPath($fDocumentID);	
 	$sToRender .= "<table width=\"100%\" border=\"0\" cellpadding=0 ><tr><td></td>\n";	
-	$sToRender .= "<td align=right width=100%><input onmouseover=\"this.style.cursor='hand'\" type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\"></td>";	
+	$sToRender .= "<td align=right width=100%><input onmouseover=\"this.style.cursor='hand'\" type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\" border=0></td>";	
 	if($fNewComment>0){	// If user is creating a new comment
 		$sToRender .= "<td width=\"10\"><a href=\"" . generateControllerLink("viewDiscussion", "fForDiscussion=1&fDocumentID=$fDocumentID") . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=0 ></a></td></tr>\n";
 	}else {				// If the user is replying to a comment
 		$sToRender .= "<td width=\"10\"><a href=\"" . generateControllerLink("viewDiscussion", "fViewComment=1&iDocumentID=$fDocumentID&iCommentID=$iCommentID") . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=0 ></a></td></tr>\n";		
 	}
 	$sToRender .= "<br><tr><td valign=\"top\" width=10><b>Subject</b></td><td colspan=2>\n";
-	$sToRender .= "<input type=\"text\" style=\"width:385\"  name=\"NewCommentSubject\" id=\"NewCommentSubject\" value=\"$sSubject\"></td></tr>\n";	
-	$sToRender .= "<tr><td valign=\"top\"><b>Body</b></td><td colspan=2><textarea  cols=60 rows=\"21\" name=\"NewComment\" id=\"NewComment\" style=\"FONT-STYLE: normal; FONT-FAMILY: sans-serif; FONT-VARIANT: normal\">$sBody</textarea></td></tr></table>\n";		
-
+	$sToRender .= "<input type=\"text\" style=\"width:385\"  name=\"NewCommentSubject\" id=\"NewCommentSubject\" value=\"$sSubject\"></td></tr>\n";			
+	$sToRender .= "<tr><td valign=\"top\"><b>Body</b></td><td colspan=2><textarea  cols=60 rows=\"21\" name=\"NewComment\" id=\"NewComment\" wrap=\"physical\" style=\"FONT-STYLE: normal; FONT-FAMILY: sans-serif; FONT-VARIANT: normal\">$sBody</textarea></td></tr></table>\n";
 	return $sToRender;	
 }
 
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
index 020432b..c335552 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc
@@ -57,7 +57,7 @@ function getNewThreadOption($fDocumentID) {
  *
  *	@param $sHeading -> text heading for the page
  */
-/*function renderHeading($sHeading) {
+function renderHeading($sHeading) {
     global $default;
         
     $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
@@ -68,7 +68,7 @@ function getNewThreadOption($fDocumentID) {
     $sToRender .= "<tr/>\n";
     $sToRender .= "</table>\n";
     return $sToRender;
-}*/
+}
 
 /** 
  *	Renders the path for the document
@@ -152,17 +152,34 @@ function getCommentBody($oComment, $iDocumentID, $oUser) {
 		
 	$sToRender .= renderHeading($sHeading);
 	$sToRender .= renderDocumentPath($iDocumentID);
+	$sBody = urldecode(str_replace("%0D%0A","<br>",str_replace("+", "&nbsp;",$oComment->getBody())));
+	$aBody = explode("<br>",$sBody);
+	$sBody = "";
+	$numChars = 80;  // number of chars in a line
 	
+	// Used for wrapping text that may be too long on one any line
+	for ($i=0; $i <= sizeof($aBody) ;$i++) {
+		if (strlen($aBody[$i]) >$numChars){
+			$loop = (strlen($aBody[$i]) - (strlen($aBody[$i])) % $numChars)/$numChars +1;			
+			
+			$j=$numChars;
+			for($j=0; $j < $loop; $j++ ) {
+				$sBody .= "<br>" . substr($aBody[$i],($j*$numChars), $numChars) . "";							
+			}  
+		} else { $sBody .= "<br>"  . $aBody[$i];	} 
+	}	
+			
 	$sToRender .= "<br><table width=100% border=0><tr ><td colspan=2><b>Author: </b>" . $oUser->getUserName() . "</td>\n";	
 	$sToRender .= "<td align=right>\n";	
 	$sToRender .= "<a href=\"" . generateControllerLink("addComment", "fDocumentID=" . $iDocumentID . "&fReplyComment=1&fCommentID=" . $oComment->getID()) . "\"><img src=\"$default->graphicsUrl/widgets/reply.gif\" border=\"0\" /></a>";	
 	$sToRender .= "</td><td width=30><a href=\"" . generateControllerLink("viewDiscussion", "fForDiscussion=1&fDocumentID=$iDocumentID") . "\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=0 ><a></td></tr>\n"; 
 	$sToRender .= "<tr><td width=\"1\" style=\"background-color:#F5F6EE;\" valign=\"top\"><b>Subject: </b></td><td width=405 style=\"background-color:#F5F6EE;\">";	
 	$sToRender .= "<a>" . $oComment->getSubject() . "</a>";
-	$sToRender .= "</td><td colspan=2><b>Date: </b><font color=\"#056DCE\">" . $oComment->getDate() . "</font>&nbsp;&nbsp;&nbsp;</td></tr><tr><td colspan=4 valign=top>";	
-	$sToRender .= "<DIV> ";		
-	$sToRender .= urldecode(str_replace("%0D%0A","<br>",str_replace("+", "&nbsp;",$oComment->getBody()))); // Div Views as HTML	
-	$sToRender .= "</DIV></td>";	
+	$sToRender .= "</td><td colspan=2><b>Date: </b><font color=\"#056DCE\">" . $oComment->getDate() . "</font>&nbsp;&nbsp;&nbsp;</td></tr><tr><td colspan=4 valign=top>";			
+	$sToRender .= "<table width=10 border=0><tr><td><a>";
+	$sToRender .= $sBody; // Div Views as HTML
+	$sToRender .= "</a></td></tr></table>";
+	$sToRender .= "</td>\n";	
 		
 	$sToRender .= "</tr></table> ";