Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r73c6c78a8c692997a40ab3506078274d623b492b -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 73c6c78a8c692997a40ab3506078274d623b492b)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc)
@@ -91,7 +91,7 @@
 				[<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>]
+					[<a href="<lams:LAMSURL/>emailUser.do?method=composeMail&userID=<c:out value="${user.userId}"/>&returnUrl=admin/usersearch.do"><fmt:message key="label.email"/></a>]
 				</c:if>
 			</td>
 		</tr>