diff --git a/lam/lib/functions.js b/lam/lib/functions.js
index 1d48c7b3..fd118d1d 100644
--- a/lam/lib/functions.js
+++ b/lam/lib/functions.js
@@ -49,6 +49,7 @@ function user_click(list, box) {
 }
 
 
+
 // mouseOver function
 function group_over(list, box) {
 	cbox = document.getElementsByName(box)[0];
@@ -75,6 +76,7 @@ function group_click(list, box) {
 }
 
 
+
 // mouseOver function
 function host_over(list, box) {
 	cbox = document.getElementsByName(box)[0];
@@ -99,3 +101,30 @@ function host_click(list, box) {
 		list.setAttribute('class','hostlist-checked', 0);
 	}
 }
+
+
+
+// mouseOver function
+function domain_over(list, box) {
+	cbox = document.getElementsByName(box)[0];
+	if (cbox.checked == false) list.setAttribute('class','domainlist-over', 0);
+}
+
+// mouseOut function
+function domain_out(list, box) {
+	cbox = document.getElementsByName(box)[0];
+	if (cbox.checked == false) list.setAttribute('class','domainlist', 0);
+}
+
+// onClick function
+function domain_click(list, box) {
+	cbox = document.getElementsByName(box)[0];
+	if (cbox.checked == true) {
+		cbox.checked = false;
+		list.setAttribute('class','domainlist-over', 0);
+	}
+	else {
+		cbox.checked = true;
+		list.setAttribute('class','domainlist-checked', 0);
+	}
+}
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 2eb7dbc9..d63c4698 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -243,6 +243,63 @@ tr.hostlist-checked {
   background-color:#f27c71;
 }
 
+/**
+ * table style for domainlist.php
+ *
+ */
+
+/* */
+table.domainnav {
+  background-color:#a8ddbf;
+  border-width:1px;
+  border-style:solid;
+  border-color:#1d993e;
+}
+
+/* text in navigation bar */
+td.domainnav-text {
+  color:green;
+  font-family:Verdana,sans-serif;
+  font-size:12px;
+}
+
+/* color for active page digit */
+td.domainnav-activepage {
+ color:red;
+}
+
+/* table preferences */
+table.domainlist {
+  border-width:1px;
+  border-style:solid;
+  border-color:#1d993e;
+}
+
+/* color of entry rows */
+tr.domainlist {
+  background-color:#c9ddd2;
+}
+
+/* color of head row */
+tr.domainlist-head {
+  background-color:#a8ddbf;
+}
+
+/* color of sorted column in head row */
+th.domainlist-sort {
+  background-color:#c9ddd2;
+}
+
+/* color of rows on mouseOver */
+tr.domainlist-over {
+  background-color:#ffe265;
+}
+
+/* color of checked rows */
+tr.domainlist-checked {
+  background-color:#f27c71;
+}
+
 /**
  * table style for delete.php
  *
diff --git a/lam/templates/lists/listdomains.php b/lam/templates/lists/listdomains.php
new file mode 100644
index 00000000..e3e5d653
--- /dev/null
+++ b/lam/templates/lists/listdomains.php
@@ -0,0 +1,253 @@
+<?php
+/*
+$Id$
+
+  This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
+  Copyright (C) 2003  Roland Gruber
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more detaexils.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+  This code displays a list of all Samba domains.
+
+*/
+include_once ("../../lib/config.inc");
+include_once ("../../lib/ldap.inc");
+include_once ("../../lib/status.inc");
+
+// start session
+session_save_path("../../sess");
+@session_start();
+
+setlanguage();
+
+// get sorting column when register_globals is off
+$sort = $_GET['sort'];
+
+// copy HTTP-GET variables to HTTP-POST
+$_POST = $_POST + $_GET;
+
+$dom_info = $_SESSION['dom_info'];
+session_register('dom_info');
+$dom_units = $_SESSION['dom_units'];
+session_register('dom_units');
+
+// check if button was pressed and if we have to add/delete a domain
+if ($_POST['new_domain'] || $_POST['del_domain']){
+	// add new domain
+	if ($_POST['new_domain']){
+		echo("<meta http-equiv=\"refresh\" content=\"0; URL=../domain.php?action=new\">");
+		exit;
+	}
+	// delete domain(s)
+	if ($_POST['del_domain']){
+		// search for checkboxes
+		$domains = array_keys($_POST, "on");
+		$domainstr = implode(";", $domains);
+		echo("<meta http-equiv=\"refresh\" content=\"0; URL=../domain.php?action=delete&amp;DN='$domainstr'\">");
+		}
+		exit;
+}
+
+echo ("<?xml version=\"1.0\" encoding=\"ISO-8859-15\"?>\n");
+echo ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n");
+echo "<html><head><title>listdomains</title>\n";
+echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\">\n";
+echo "</head><body>\n";
+echo "<script src=\"../../lib/functions.js\" type=\"text/javascript\" language=\"javascript\"></script>\n";
+
+// get current page
+$page = $_GET["page"];
+if (!$page) $page = 1;
+// take maximum count of domain entries shown on one page out of session
+if ($_SESSION["config"]->get_MaxListEntries() <= 0)
+	$max_pageentrys = 10;	// default setting, if not yet set
+else
+	$max_pageentrys = $_SESSION["config"]->get_MaxListEntries();
+
+
+// generate attribute and description tables
+$attr_array;	// list of LDAP attributes to show
+$desc_array;	// list of descriptions for the attributes
+$attr_array[] = "sambaDomainName";
+$attr_array[] = "sambaSID";
+$desc_array[] = _("Domain Name");
+$desc_array[] = _("Domain SID");
+
+// check search suffix
+if ($_POST['dom_suffix']) $dom_suffix = $_POST['dom_suffix'];  // new suffix selected via combobox
+elseif ($_SESSION['dom_suffix']) $dom_suffix = $_SESSION['dom_suffix'];  // old suffix from session
+else $dom_suffix = $_SESSION["config"]->get_DomainSuffix();  // default suffix
+session_register('dom_suffix');
+
+if (! $_GET['norefresh']) {
+	// configure search filter
+	$filter = "(sambaDomainName=*)";
+	$attrs = $attr_array;
+	$sr = @ldap_search($_SESSION["ldap"]->server(),
+		$dom_suffix,
+		$filter, $attrs);
+	if ($sr) {
+		$dom_info = ldap_get_entries($_SESSION["ldap"]->server, $sr);
+		ldap_free_result($sr);
+		if ($dom_info["count"] == 0) StatusMessage("WARN", "", _("No Samba Domains found!"));
+		// delete first array entry which is "count"
+		array_shift($dom_info);
+		// sort rows by sort column ($sort)
+		usort($dom_info, "cmp_array");
+	}
+	else StatusMessage("ERROR", _("LDAP Search failed! Please check your preferences."), _("No Samba Domains found!"));
+}
+else {
+	if (sizeof($dom_info) == 0) StatusMessage("WARN", "", _("No Samba Domains found!"));
+	// sort rows by sort column ($sort)
+	if ($dom_info) usort($dom_info, "cmp_array");
+}
+
+echo ("<form action=\"listdomains.php\" method=\"post\">\n");
+
+// draw navigation bar if domain accounts were found
+if (sizeof($dom_info) > 0) {
+draw_navigation_bar(sizeof($dom_info));
+echo ("<br>\n");
+}
+
+// print domain table header
+echo "<table rules=\"all\" class=\"domainlist\" width=\"100%\">\n";
+echo "<tr class=\"domainlist-head\"><th width=22 height=34></th><th></th>";
+// table header
+for ($k = 0; $k < sizeof($desc_array); $k++) {
+	if (strtolower($attr_array[$k]) == $sort) {
+		echo "<th class=\"domainlist-sort\"><a href=\"listdomains.php?".
+			"sort=" . strtolower($attr_array[$k]) . "&amp;norefresh=y" . "\">" . $desc_array[$k] . "</a></th>";
+	}
+	else echo "<th><a href=\"listdomains.php?".
+		"sort=" . strtolower($attr_array[$k]) . "&amp;norefresh=y" . "\">" . $desc_array[$k] . "</a></th>";
+}
+echo "</tr>\n";
+
+// calculate which rows to show
+$table_begin = ($page - 1) * $max_pageentrys;
+if (($page * $max_pageentrys) > sizeof($dom_info)) $table_end = sizeof($dom_info);
+else $table_end = ($page * $max_pageentrys);
+
+// print domain list
+for ($i = $table_begin; $i < $table_end; $i++) {
+	echo("<tr class=\"domainlist\" onMouseOver=\"domain_over(this, '" . $dom_info[$i]["dn"] . "')\"" .
+								" onMouseOut=\"domain_out(this, '" . $dom_info[$i]["dn"] . "')\"" .
+								" onClick=\"domain_click(this, '" . $dom_info[$i]["dn"] . "')\"" .
+								" onDblClick=\"parent.frames[1].location.href='../domain.php?action=edit&amp;DN=" . $dom_info[$i]["dn"] . "'\">" .
+								" <td height=22><input onClick=\"domain_click(this, '" . $dom_info[$i]["dn"] . "')\" type=\"checkbox\" name=\"" . $dom_info[$i]["dn"] . "\"></td>" .
+								" <td align='center'><a href=\"../domain.php?action=edit&amp;DN='" . $dom_info[$i]["dn"] . "'\">" . _("Edit") . "</a></td>");
+	for ($k = 0; $k < sizeof($attr_array); $k++) {
+		echo ("<td>");
+		// print all attribute entries seperated by "; "
+		if (sizeof($dom_info[$i][strtolower($attr_array[$k])]) > 0) {
+			// delete first array entry which is "count"
+			if ((! $_GET['norefresh']) && (is_array($dom_info[$i][strtolower($attr_array[$k])]))) array_shift($dom_info[$i][strtolower($attr_array[$k])]);
+			if (is_array($dom_info[$i][strtolower($attr_array[$k])])) echo implode("; ", $dom_info[$i][strtolower($attr_array[$k])]);
+			else echo $dom_info[$i][strtolower($attr_array[$k])];
+		}
+		echo ("</td>");
+	}
+	echo("</tr>\n");
+}
+echo ("</table>");
+
+echo ("<br>");
+
+// draw navigation bar if domain accounts were found
+if (sizeof($dom_info) > 0) {
+draw_navigation_bar(sizeof($dom_info));
+echo ("<br>\n");
+}
+
+if (! $_GET['norefresh']) {
+	// generate list of possible suffixes
+$dom_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_DomainSuffix());
+}
+
+echo ("<p align=\"left\">\n");
+echo ("<input type=\"submit\" name=\"new_domain\" value=\"" . _("New Domain") . "\">\n");
+if (sizeof($dom_info) > 0) echo ("<input type=\"submit\" name=\"del_domain\" value=\"" . _("Delete Domain(s)") . "\">\n");
+// print combobox with possible sub-DNs
+if (sizeof($dom_units) > 1) {
+echo ("&nbsp;&nbsp;&nbsp;&nbsp;<b>" . _("Suffix") . ": </b>");
+echo ("<select size=1 name=\"dom_suffix\">\n");
+for ($i = 0; $i < sizeof($dom_units); $i++) {
+	if ($dom_suffix == $dom_units[$i]) echo ("<option selected>" . $dom_units[$i] . "</option>\n");
+	else echo("<option>" . $dom_units[$i] . "</option>\n");
+}
+echo ("</select>\n");
+echo ("<input type=\"submit\" name=\"refresh\" value=\"" . _("Change Suffix") . "\">");
+}
+echo ("</p>\n");
+echo ("</form>\n");
+echo "</body></html>\n";
+
+/**
+ * @brief draws a navigation bar to switch between pages
+ *
+ *
+ * @return void
+ */
+function draw_navigation_bar ($count) {
+  global $max_pageentrys;
+  global $page;
+  global $sort;
+
+  echo ("<table class=\"domainnav\" width=\"100%\" border=\"0\">\n");
+  echo ("<tr>\n");
+  echo ("<td><input type=\"submit\" name=\"refresh\" value=\"" . _("Refresh") . "\">&nbsp;&nbsp;");
+  if ($page != 1)
+    echo ("<a href=\"listdomains.php?page=" . ($page - 1) . "&amp;sort=" . $sort . "\">&lt;=</a>\n");
+  else
+    echo ("&lt;=");
+  echo ("&nbsp;");
+
+  if ($page < ($count / $max_pageentrys))
+    echo ("<a href=\"listdomains.php?page=" . ($page + 1) . "&amp;sort=" . $sort . "\">=&gt;</a>\n");
+  else
+    echo ("=&gt;</td>");
+
+  echo ("<td class=\"domainnav-text\">");
+  echo "&nbsp;" . $count . " " .  _("Samba Domain(s) found");
+  echo ("</td>");
+
+  echo ("<td class=\"domainlist_activepage\" align=\"right\">");
+  for ($i = 0; $i < ($count / $max_pageentrys); $i++) {
+    if ($i == $page - 1)
+      echo ("&nbsp;" . ($i + 1));
+    else
+      echo ("&nbsp;<a href=\"listdomains.php?page=" . ($i + 1) .
+	    "&amp;sort=" . $sort . "\">" . ($i + 1) . "</a>\n");
+  }
+  echo ("</td></tr></table>\n");
+}
+
+// compare function used for usort-method
+// rows are sorted with the first attribute entry of the sort column
+// if objects have attributes with multiple values the others are ignored
+function cmp_array($a, $b) {
+	// sort specifies the sort column
+	global $sort;
+	global $attr_array;
+	// sort by first attribute with name $sort
+	if (!$sort) $sort = strtolower($attr_array[0]);
+	if ($a[$sort][0] == $b[$sort][0]) return 0;
+	else if ($a[$sort][0] == max($a[$sort][0], $b[$sort][0])) return 1;
+	else return -1;
+}
+
+?>
diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php
index e2136f3a..faa5294d 100644
--- a/lam/templates/lists/listhosts.php
+++ b/lam/templates/lists/listhosts.php
@@ -77,7 +77,7 @@ $hash_table = $_SESSION["ldap"]->attributeHostArray();
 // get current page
 $page = $_GET["page"];
 if (!$page) $page = 1;
-// take maximum count of user entries shown on one page out of session
+// take maximum count of host entries shown on one page out of session
 if ($_SESSION["config"]->get_MaxListEntries() <= 0)
 	$max_pageentrys = 10;	// default setting, if not yet set
 else
diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index 93d20860..21d2df70 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -22,6 +22,13 @@ $Id$
 
 
 */
+include_once ("../lib/config.inc");
+
+// start session
+session_save_path("../sess");
+@session_start();
+
+setlanguage();
 
 echo ("<?xml version=\"1.0\" encoding=\"ISO-8859-15\"?>\n");
 echo ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n");
@@ -38,8 +45,12 @@ echo ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http:/
 <body>
 <table border=0 width="100%">
 	<tr>
-    	<td width="100" align="left"><a href="./profedit/profilemain.php" target="mainpart"><?php echo _("Profile Editor") ?></a></td>
-		<td rowspan=3 colspan=3 align="center">
+    	<td width="100" align="left"><a href="./profedit/profilemain.php" target="mainpart"><?php echo _("Profile Editor"); ?></a></td>
+		<?
+			// Samba 3 has more list views
+			if ($_SESSION['config']->get_samba3() == "yes") echo "<td rowspan=3 colspan=5 align=\"center\">\n";
+			else echo "<td rowspan=3 colspan=3 align=\"center\">\n";
+		?>
 			<a href="http://lam.sf.net" target="new_window"><img src="../graphics/banner.jpg" border=1 alt="LDAP Account Manager"></a>
 		</td>
 	<td width="100" align="right" height=20><a href="./logout.php" target="_top"><big><b><?php echo _("Logout") ?></b></big></a></td>
@@ -51,12 +62,30 @@ echo ("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http:/
 	<tr>
     	<td align="left"><a href="masscreate.php" target="mainpart"><?php echo _("File Upload") ?></a></td>
 	</tr>
-	<tr><td colspan=5>&nbsp;</td></tr>
+	<tr>
+		<?
+			// Samba 3 has more list views
+			if ($_SESSION['config']->get_samba3() == "yes") echo "<td colspan=7>&nbsp;</td>\n";
+			else echo "<td colspan=5>&nbsp;</td>\n";
+		?>
+	</tr>
 	<tr>
 		<td></td>
-		<td width="200" align="center"><a href="./lists/listusers.php" target="mainpart"> <?php echo _("Users");?> </a></td>
-		<td width="200" align="center"><a href="./lists/listgroups.php" target="mainpart"> <?php echo _("Groups");?> </a></td>
-		<td width="200" align="center"><a href="./lists/listhosts.php" target="mainpart"> <?php echo _("Hosts");?> </a></td>
+		<?
+			// Samba 3 has more list views
+			if ($_SESSION['config']->get_samba3() == "yes") {
+				echo '<td width="120" align="center"><a href="./lists/listmappings.php" target="mainpart">' . _("User/Group Mapping") . '</a></td>' . "\n";
+				echo '<td width="120" align="center"><a href="./lists/listdomains.php" target="mainpart">' . _("Domains") . '</a></td>' . "\n";
+				echo '<td width="120" align="center"><a href="./lists/listusers.php" target="mainpart">' . _("Users") . '</a></td>' . "\n";
+				echo '<td width="120" align="center"><a href="./lists/listgroups.php" target="mainpart">' . _("Groups") . '</a></td>' . "\n";
+				echo '<td width="120" align="center"><a href="./lists/listhosts.php" target="mainpart">' . _("Hosts") . '</a></td>' . "\n";
+			}
+			else {
+				echo '<td width="200" align="center"><a href="./lists/listusers.php" target="mainpart">' . _("Users") . '</a></td>' . "\n";
+				echo '<td width="200" align="center"><a href="./lists/listgroups.php" target="mainpart">' . _("Groups") . '</a></td>' . "\n";
+				echo '<td width="200" align="center"><a href="./lists/listhosts.php" target="mainpart">' . _("Hosts") . '</a></td>' . "\n";
+			}
+		?>
 		<td></td>
 	</tr>
 </table>