diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
index f7df18a..1c2ef9f 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentBL.php
@@ -105,8 +105,24 @@ if (checkSession()) {
 		} else if (isset($fReplyComment)){  // if user is replying to existing comment			
 			$main->setFormAction($_SERVER['PHP_SELF'] . "?fAddCommentSubmit=1&iDocumentID=$fDocumentID");
 			
-			$oComment = DiscussionComment::get($fCommentID);
-			$oPatternCustom->addHtml(getAddComment($fDocumentID,"Re: " . $oComment->getSubject() , "\n\n\n[Start Text Body]\n\n" . urldecode( $oComment->getBody())  . "\n\n[End Text Body]"));	
+			$oComment = DiscussionComment::get($fCommentID);						
+			$oUser = User::get($oComment->getUserID());
+			
+			$sReplyBody = $oComment->getBody();			
+			
+			$sReplyBodyHeader .= "\n\n\n>------ Original Message ------";
+			$sReplyBodyHeader .= "\n>User:     " . $oUser->getName();
+			$sReplyBodyHeader .= "\n>Date:     " . $oComment->getDate();
+			$sReplyBodyHeader .= "\n>Subject: " . $oComment->getSubject();
+			$sReplyBodyHeader .= "\n>---------------------------------------";
+			
+			$sReplyBody = $sReplyBodyHeader . "\n>" .  str_replace("%0D%0A" ,"%0D%0A>", $sReplyBody); // Put in ">" as indentation for the reply
+			
+			if (strpos($oComment->getSubject(), "Re:") != " "){
+				$sReply = "Re: ";
+			}else { $sReply = ""; }
+			
+			$oPatternCustom->addHtml(getAddComment($fDocumentID, $sReply . $oComment->getSubject() , urldecode($sReplyBody) ));	
 								
 		} else if (isset($fNewThread)){ // Start adding a new Thread 
 			$main->setFormAction($_SERVER['PHP_SELF'] . "?fAddCommentSubmit=1&iDocumentID=$fDocumentID&fNewThread=1");
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
index 0dbe75a..f89aa3d 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc
@@ -70,7 +70,7 @@ function getAddComment($fDocumentID, $sSubject, $sBody) {
 	$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 width=\"10\"><img src=\"$default->graphicsUrl/widgets/back.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" ></td></tr>\n";
+	$sToRender .= "<td width=\"10\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" onmouseover=\"this.style.cursor='hand'\" onclick=\"javascript: history.go(-1);\" ></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";		
diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
index 028ef6f..dd09c1d 100644
--- a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionBL.php
@@ -62,6 +62,9 @@ if(checkSession()) {
 					    $oSearchResults = & new PatternBrowseableSearchResults ($sQuery, 13, $aColumns, $aColumnTypes, $aColumnNames, $aHyperLinkURL, $aQueryStringCols, $aQueryStringVars);
 					    $oSearchResults->setStartIndex($iStartIndex);
 					    $oSearchResults->setQueryString("&fDocumentID=$fDocumentID&fForDiscussion=1");
+					    $sToRender .= renderHeading("Document Discussion Thread");
+						$sToRender .= renderDocumentPath($oThread->getDocumentID());
+					    $oPatternCustom->addHtml($sToRender);
 					    $oPatternCustom->addHtml(getPageButtons($oThread));
 					    $oPatternCustom->addHtml($oSearchResults->render());