Index: lams_admin/web/usersearchlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/usersearchlist.jsp,v
diff -u -r1.19.10.1 -r1.19.10.2
--- lams_admin/web/usersearchlist.jsp	16 Nov 2009 02:25:16 -0000	1.19.10.1
+++ lams_admin/web/usersearchlist.jsp	16 Oct 2010 11:21:54 -0000	1.19.10.2
@@ -1,5 +1,8 @@
 <%@ include file="/taglibs.jsp"%>
 
+<c:set var="useInternalSMTPServer"><lams:Configuration key="InternalSMTPServer"/></c:set>
+<c:set var="smtpServer"><lams:Configuration key="SMTPServer"/></c:set>
+
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-1.1.4.pack.js"></script>
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
@@ -77,11 +80,15 @@
 				<c:out value="${user.email}"/>
 			</td>
 			<td>
-				<a href="user.do?method=edit&userId=<c:out value="${user.userId}"/>"><fmt:message key="admin.edit"/></a>
+				[<a href="user.do?method=edit&userId=<c:out value="${user.userId}"/>"><fmt:message key="admin.edit"/></a>]
 				&nbsp;
-				<a href="user.do?method=remove&userId=<c:out value="${user.userId}"/>"><fmt:message key="admin.user.delete"/></a>
+				[<a href="user.do?method=remove&userId=<c:out value="${user.userId}"/>"><fmt:message key="admin.user.delete"/></a>]
 				&nbsp;
-				<a href="<lams:LAMSURL/>/loginas.do?login=<c:out value="${user.login}"/>"><fmt:message key="label.login.as"/></a>
+				[<a href="<lams:LAMSURL/>/loginas.do?login=<c:out value="${user.login}"/>"><fmt:message key="label.login.as"/></a>]
+				
+				<c:if test="${(not empty user.email) && (useInternalSMTPServer || not empty smtpServer)}">
+					[<a href="emailUser.do?method=composeMail&userId=<c:out value="${user.userId}"/>"><fmt:message key="label.email"/></a>]
+				</c:if>
 			</td>
 		</tr>
 	</c:forEach>