diff --git a/lam/HISTORY b/lam/HISTORY
index 98cf5420..e26d9f93 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,3 +1,7 @@
+March/April 2.3.0
+  - show mail addresses as link in account list
+
+
 23.01.2008 2.2.0
   - account lists:
    -> allow to switch sorting
diff --git a/lam/lib/types/user.inc b/lam/lib/types/user.inc
index 51b8e5bb..c22b4a0d 100644
--- a/lam/lib/types/user.inc
+++ b/lam/lib/types/user.inc
@@ -210,6 +210,16 @@ class lamUserList extends lamList {
 			$photoFile = '../../tmp/' . $jpeg_filename;
 			echo "<img src=\"" . $photoFile . "\" alt=\"" . _('Photo') . "\">";
 		}
+		elseif (($attribute == 'mail') || ($attribute == 'rfc822Mailbox')) {
+			if (isset($entry[$attribute][0]) && ($entry[$attribute][0] != '')) {
+				for ($i = 0; $i < sizeof($entry[$attribute]); $i++) {
+					if ($i > 0) {
+						echo ", ";
+					}
+					echo "<a href=\"mailto:" . $entry[$attribute][$i] . "\">" . $entry[$attribute][$i] . "</a>\n";
+				}
+			}
+		}
 		// print all other attributes
 		else {
 			parent::listPrintTableCellContent($entry, $attribute);