diff --git a/lam-web/changelog/index.htm b/lam-web/changelog/index.htm
index 766bda9d..48b8e184 100644
--- a/lam-web/changelog/index.htm
+++ b/lam-web/changelog/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/cvs-access/index.htm b/lam-web/cvs-access/index.htm
index 50950ea3..7cc67a47 100755
--- a/lam-web/cvs-access/index.htm
+++ b/lam-web/cvs-access/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/developers/docs.htm b/lam-web/developers/docs.htm
index 3446c9f5..a8c380e4 100644
--- a/lam-web/developers/docs.htm
+++ b/lam-web/developers/docs.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/documentation/faq.htm b/lam-web/documentation/faq.htm
index d3d8a8aa..39dfd815 100644
--- a/lam-web/documentation/faq.htm
+++ b/lam-web/documentation/faq.htm
@@ -35,7 +35,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../changelog/index.htm'" class="nav"><a class="nav" href="../changelog/index.htm">Changelog</a></td>
     </tr>
     <tr>
-      <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/index.htm'" class="nav">      <a class="nav" href="../todo/index.htm">ToDo</a></td>
+      <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/index.htm'" class="nav">      <a class="nav" href="../todo/index.htm">Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/bugs.htm'" class="nav">      <a class="nav" href="../todo/bugs.htm">Bugs</a></td>
diff --git a/lam-web/documentation/howto.htm b/lam-web/documentation/howto.htm
index 2c5f2704..2e60fb0e 100755
--- a/lam-web/documentation/howto.htm
+++ b/lam-web/documentation/howto.htm
@@ -43,7 +43,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../changelog/index.htm'" class="nav"><a class="nav" href="../changelog/index.htm">Changelog</a></td>
     </tr>
     <tr>
-      <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/index.htm'" class="nav">      <a class="nav" href="../todo/index.htm">ToDo</a></td>
+      <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/index.htm'" class="nav">      <a class="nav" href="../todo/index.htm">Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/bugs.htm'" class="nav">      <a class="nav" href="../todo/bugs.htm">Bugs</a></td>
diff --git a/lam-web/documentation/index.htm b/lam-web/documentation/index.htm
index f55dd9dd..a4fe0a1d 100755
--- a/lam-web/documentation/index.htm
+++ b/lam-web/documentation/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/documentation/install.htm b/lam-web/documentation/install.htm
index 5d34dc93..eb2ddcc5 100644
--- a/lam-web/documentation/install.htm
+++ b/lam-web/documentation/install.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/documentation/readme.htm b/lam-web/documentation/readme.htm
index ba8c5d48..d09b85b1 100644
--- a/lam-web/documentation/readme.htm
+++ b/lam-web/documentation/readme.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/documentation/supportedSchemas.htm b/lam-web/documentation/supportedSchemas.htm
index 9b3a89eb..b4273af9 100644
--- a/lam-web/documentation/supportedSchemas.htm
+++ b/lam-web/documentation/supportedSchemas.htm
@@ -55,7 +55,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../changelog/index.htm'" class="nav"><a class="nav" href="../changelog/index.htm">Changelog</a></td>
     </tr>
     <tr>
-      <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/index.htm'" class="nav">      <a class="nav" href="../todo/index.htm">ToDo</a></td>
+      <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/index.htm'" class="nav">      <a class="nav" href="../todo/index.htm">Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)" onclick="parent.location.href='../todo/bugs.htm'" class="nav">      <a class="nav" href="../todo/bugs.htm">Bugs</a></td>
diff --git a/lam-web/download/debian.htm b/lam-web/download/debian.htm
index 0b44300e..2778d8e1 100755
--- a/lam-web/download/debian.htm
+++ b/lam-web/download/debian.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/download/freebsd.htm b/lam-web/download/freebsd.htm
index 931fd80d..b90c040a 100644
--- a/lam-web/download/freebsd.htm
+++ b/lam-web/download/freebsd.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/download/index.htm b/lam-web/download/index.htm
index ac6a632e..2f23c02b 100755
--- a/lam-web/download/index.htm
+++ b/lam-web/download/index.htm
@@ -62,7 +62,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/download/oldReleases.htm b/lam-web/download/oldReleases.htm
index 6e9ef69e..d51cc7fb 100755
--- a/lam-web/download/oldReleases.htm
+++ b/lam-web/download/oldReleases.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/download/rpm.htm b/lam-web/download/rpm.htm
index c74353db..3026d491 100755
--- a/lam-web/download/rpm.htm
+++ b/lam-web/download/rpm.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/i18n/i18nhowto.htm b/lam-web/i18n/i18nhowto.htm
index 5c8e6a67..ffadd81d 100755
--- a/lam-web/i18n/i18nhowto.htm
+++ b/lam-web/i18n/i18nhowto.htm
@@ -54,7 +54,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/i18n/index.htm b/lam-web/i18n/index.htm
index 1101e155..9d2015e1 100755
--- a/lam-web/i18n/index.htm
+++ b/lam-web/i18n/index.htm
@@ -54,7 +54,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/index.htm b/lam-web/index.htm
index 5fd216db..5c4b2cdf 100755
--- a/lam-web/index.htm
+++ b/lam-web/index.htm
@@ -55,7 +55,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='todo/index.htm'"
  class="nav">      <a class="nav" href="todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/live-demo/index.htm b/lam-web/live-demo/index.htm
index 2abf5833..280eea39 100755
--- a/lam-web/live-demo/index.htm
+++ b/lam-web/live-demo/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/mailinglists/index.htm b/lam-web/mailinglists/index.htm
index d5aefc6d..15565b64 100755
--- a/lam-web/mailinglists/index.htm
+++ b/lam-web/mailinglists/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/new-developers.htm b/lam-web/new-developers.htm
index 2fbdfe3e..0ad0552e 100644
--- a/lam-web/new-developers.htm
+++ b/lam-web/new-developers.htm
@@ -57,7 +57,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='todo/index.htm'"
  class="nav">      <a class="nav" href="todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/news/archives.htm b/lam-web/news/archives.htm
index d3df39bb..977d6604 100755
--- a/lam-web/news/archives.htm
+++ b/lam-web/news/archives.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/news/index.htm b/lam-web/news/index.htm
index 54752981..045c6976 100755
--- a/lam-web/news/index.htm
+++ b/lam-web/news/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/screenshots/index.htm b/lam-web/screenshots/index.htm
index 03a283bf..fbb38d23 100755
--- a/lam-web/screenshots/index.htm
+++ b/lam-web/screenshots/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/sponsors/donations.htm b/lam-web/sponsors/donations.htm
index d4d8ed77..c99dbeea 100755
--- a/lam-web/sponsors/donations.htm
+++ b/lam-web/sponsors/donations.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/sponsors/index.htm b/lam-web/sponsors/index.htm
index 3ed26c38..8a65e315 100755
--- a/lam-web/sponsors/index.htm
+++ b/lam-web/sponsors/index.htm
@@ -54,7 +54,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/todo/bugs.htm b/lam-web/todo/bugs.htm
index 3189f4ef..13501e4a 100644
--- a/lam-web/todo/bugs.htm
+++ b/lam-web/todo/bugs.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
diff --git a/lam-web/todo/index.htm b/lam-web/todo/index.htm
index c47fcde0..eb450c69 100644
--- a/lam-web/todo/index.htm
+++ b/lam-web/todo/index.htm
@@ -56,7 +56,7 @@
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
  onclick="parent.location.href='../todo/index.htm'"
  class="nav">      <a class="nav" href="../todo/index.htm"
->ToDo</a></td>
+>Roadmap</a></td>
     </tr>
     <tr>
       <td onmouseover="list_over(this)" onmouseout="list_out(this)"
@@ -207,9 +207,9 @@ SourceForge</a></td>
 <td class="mainarea">
 
 
-<h1>ToDo</h1>
+<h1>Roadmap</h1>
 <br>
-<p>Here we will inform you in the future about what we plan to include
+<p>Here we inform you about what we plan to include
 in the upcoming releases.<br>
 <br>
 </p>
@@ -219,14 +219,18 @@ Long-term topics:
 </ul>
 LAM 2.2.x: (planned for December/January)
 <ul>
-<li>Unix/Samba: set random passwords</li>
+<li>Unix/Samba: set random passwords (done)</li>
 <li>LAM Pro: separate password changing dialog, send password via mail (done)</li>
 <li>account lists: allow to switch sorting direction (done)</li>
-<li>account pages: display save and profile controls on all pages</li>
+<li>account pages: display save and profile controls on all pages (done)</li>
 </ul>
 LAM 2.3.x:
 <ul>
 <li>Unix: allow primary group to be also in secondary groups (config option)</li>
+<li>Personal: add l, st, physicaldeliveryofficename and carlicense</li>
+<li>Kolab: LAM Pro extension</li>
+<li>new account modules</li>
+<li>redesign of PDF editor</li>
 </ul>
 
 <br>