diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php
index 604afb1..13f13e9 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php
@@ -42,9 +42,16 @@ if (checkSession()) {
                         // add the link to the document to the mail
                         $sMessage .= ' ' . generateControllerLink("viewDocument", "fDocumentID=$fDocumentID", $oDocument->getName());
 
+                        // add optional comment
+                        if (strlen($fComment) > 0) {
+                        	$sMessage .= "<br><br>$fComment";
+                        }
+                        
+                        $sTitle = "Link: " . $oDocument->getName() . " from " . $oUser->getName();
+                        
                         //email the hyperlink
-                        $oEmail = new Email();                        
-                        $oEmail->send($fToEmail, "Document link", $sMessage);
+                        $oEmail = new Email();
+                        $oEmail->send($fToEmail, $sTitle, $sMessage);
                         
                         //go back to the document view page
                         redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID");
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
index ddf55ed..defa6e3 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
@@ -44,7 +44,7 @@ function getDocumentEmailPage($oDocument,$oUserArray) {
 	$sToRender .= "<OPTION value=\"1\">\n";
 	$sToRender .= "Select Recipient</OPTION>\n";	
 	for ($i = 0; $i < count($oUserArray); $i++) {
-		if(strlen($oUserArray[$i]->getEmail())>0){ // if an amil address exists			
+		if(strlen($oUserArray[$i]->getEmail())>0){ // if an email address exists			
 			$sToRender .= "<OPTION value=\"" . $oUserArray[$i]->getEmail() . "\" onclick=\"javascript: getObject(\"fToEmail\").value=getObject(\"fToEmail\").value + ';'\" >\n";
 			$sToRender .= $oUserArray[$i]->getName();
 			$sToRender .= "</OPTION>\n";
@@ -54,6 +54,7 @@ function getDocumentEmailPage($oDocument,$oUserArray) {
 	$sToRender .= "<tr><td>Email Addresses:</td><td><input type=\"text\" name=\"fToEmail\" style=\"width:270\"/></td><td><img src=\"$default->graphicsUrl/widgets/clear.gif\" onMouseDown=\"var oTemp = getObject('fToEmail'); oTemp.value=''; oTemp = getObject('UserSelect'); oTemp.selectedIndex=0;\" onmouseover=\"this.style.cursor='hand'\"></td></tr>\n";	
 	
 	$sToRender .= "<tr><td></td><td>(separate multiple addresses with a semicolon)</td></tr>";
+	$sToRender .= "<tr><td>Comment</td><td><textarea rows=\"5\" cols=\"30\" name=\"fComment\"></textarea></td></tr>\n";
 	$sToRender .= "<tr><td>&nbsp</td><td>&nbsp</td></tr>\n";
 	$sToRender .= "<tr><td><table><tr><td><input type=\"image\" src=\"$default->graphicsUrl/widgets/email.gif\" border=\"0\"/></td><td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"/></a></td></tr></table></td>\n";
 	$sToRender .= "</table>\n";
@@ -61,12 +62,8 @@ function getDocumentEmailPage($oDocument,$oUserArray) {
 	$sToRender .= "function getObject(sObjName){\n";	//Function to return an html object(Netscape 4.7 compatable)	
 	$sToRender .= "		var oSelect;\n";	
 	$sToRender .= "	  	oSelect = document.forms[0].elements[sObjName];";
-	$sToRender .= "   	//alert(document.forms[0].elements[sObjName].value);\n";
 	$sToRender .= "   	return oSelect;\n";
 	$sToRender .= "}\n";		
-	$sToRender .= "function ftest(){\n";	
-	$sToRender .= "		alert('Wsup!');";	
-	$sToRender .= "}\n";
 	$sToRender .= "</script >\n";
 	return $sToRender;
 }