diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php
index 7cd1068..effc254 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailBL.php
@@ -55,7 +55,8 @@ if (checkSession()) {
 
 
                         $oPatternCustom = & new PatternCustom();
-                        $oPatternCustom->setHtml(getDocumentEmailPage($oDocument));
+                        $oUserArray = User::getList();
+                        $oPatternCustom->setHtml(getDocumentEmailPage($oDocument,$oUserArray));
                         $main->setErrorMessage("The email address you entered was invalid.  Please enter<br> " .
                                                "an email address of the form someone@somewhere.some postfix");
                         $main->setFormAction($_SERVER["PHP_SELF"] . "?fDocumentID=$fDocumentID&fSendEmail=1");
@@ -67,9 +68,10 @@ if (checkSession()) {
                 //ask for an email address
                 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
                 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
-
+				
+				$oUserArray = User::getList();
                 $oPatternCustom = & new PatternCustom();
-                $oPatternCustom->setHtml(getDocumentEmailPage($oDocument));
+                $oPatternCustom->setHtml(getDocumentEmailPage($oDocument,$oUserArray));
                 $main->setCentralPayload($oPatternCustom);
                 $main->setFormAction($_SERVER["PHP_SELF"] . "?fDocumentID=$fDocumentID&fSendEmail=1");
                 $main->render();
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
index 2d8aa8f..f3de496 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc
@@ -28,13 +28,25 @@ function getDocumentPath($oDocument) {
 	return "<table border=\"0\" width = 100%><tr><td bgcolor=\"$sTDBGColour\">$sDocumentPath</td></tr></table>\n";	
 }
 
-function getDocumentEmailPage($oDocument) {
+function getDocumentEmailPage($oDocument,$oUserArray) {
 	global $default;
     $sToRender = renderHeading("Email document link");
 	$sToRender .= getDocumentPath($oDocument) . "\n<br>\n";	 
-	$sToRender .= "<table>\n";
-	$sToRender .= "<tr><td>Recipient name:</td><td><input type=\"text\" name=\"fToName\" /></td></tr>\n";
-	$sToRender .= "<tr><td>Email address:</td><td><input type=\"text\" name=\"fToEmail\" />(separate multiple addresses with a semicolon)</td></tr>\n";
+	$sToRender .= "<table>\n";	
+	$sToRender .= "<tr><td>Recipient name:</td><td>\n";
+	$sToRender .= "<select name=\"UserSelect\" id=\"UserSelect\" onchange=\"javascript: var sColon; var oTemp = document.getElementsByName('fToEmail')[0]; if(oTemp.value.length>0) sColon=';'; else sColon=''; if (this.value!=1 && this.value!='' && this.value!=' ') {oTemp.value=oTemp.value + sColon + this.value ;}\">\n";
+	$sToRender .= "<OPTION value=\"1\">\n";
+	$sToRender .= "Select email adresses</OPTION>\n";	
+	for ($i = 0; $i < count($oUserArray); $i++) {
+		if(strlen($oUserArray[$i]->getEmail())>0){ // if an amil address exists
+			$sToRender .= "<OPTION value=\"" . $oUserArray[$i]->getEmail() . "\" onclick=\"document.fToEmail.value=document.fToEmail.value + ;\" >\n";
+			$sToRender .= $oUserArray[$i]->getName();
+			$sToRender .= "</OPTION>\n";
+		}
+	}	
+	$sToRender .= "</select></td></tr>\n";	
+	$sToRender .= "<tr><td>Email address:</td><td><input type=\"text\" name=\"fToEmail\" style=\"width:270\"/></td><td><img src=\"$default->graphicsUrl/widgets/clear.gif\" onclick=\"document.getElementsByName('fToEmail')[0].value='';document.getElementsByName('UserSelect')[0].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>&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";