diff --git a/config/cdsnavbar.wml b/config/cdsnavbar.wml
index fa3f0feb4..2839df25c 100644
--- a/config/cdsnavbar.wml
+++ b/config/cdsnavbar.wml
@@ -1,426 +1,445 @@
 ## $Id$
 ## This file defines CDSware navbar and subnavbars.
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002, 2003, 2004, 2005 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 details.  
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## You probably went here from "config.wml", so let's continue with
 ## its numerotation of CDSware configuration parts...
 
 ################################
 ## Part 4: CDS navigation bar ##
 ################################
 
 ## The navigation bar and sub-bars are defined here.  You may modify
 ## the definitions now, if you wish, and if you really know what you
 ## are doing. :-).  After that return to "config.wml" file, and the
 ## main CDSware source directory, and type "make clean && make".
 
 #use wml::des::navbar
 
 ## navbar admin:
 <navbar:define name=admin
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> </navbar:prolog>
 
   <navbar:button id=admin txt="<strong>ADMIN AREA</strong>" url="<WEBURL>/admin/" hint="CDSware Administrators Area">
   <navbar:button id=howto txt="HOWTOs" url="<WEBURL>/admin/howto/" hint="CDSware Admin HOWTO Documents" menu="admin-howto">
   <navbar:button id=bibconvert txt="BibConvert Admin" url="<WEBURL>/admin/bibconvert/" hint="CDSware BibConvert Admin" menu="admin-bibconvert">
   <navbar:button id=bibedit txt="BibEdit Admin" url="<WEBURL>/admin/bibedit/" hint="CDSware BibEdit Admin" menu="admin-bibedit">
   <navbar:button id=bibformat txt="BibFormat Admin" url="<WEBURL>/admin/bibformat/" hint="CDSware BibFormat Admin" menu="admin-bibformat">
   <navbar:button id=bibharvest txt="BibHarvest Admin" url="<WEBURL>/admin/bibharvest/" hint="CDSware BibHarvest Admin" menu="admin-bibharvest">
   <navbar:button id=bibindex txt="BibIndex Admin" url="<WEBURL>/admin/bibindex/" hint="CDSware BibIndex Admin" menu="admin-bibindex">
   <navbar:button id=bibrank txt="BibRank Admin" url="<WEBURL>/admin/bibrank/" hint="CDSware BibRank Admin" menu="admin-bibrank">
   <navbar:button id=bibsched txt="BibSched Admin" url="<WEBURL>/admin/bibsched/" hint="CDSware BibSched Admin" menu="admin-bibsched">
   <navbar:button id=bibupload txt="BibUpload Admin" url="<WEBURL>/admin/bibupload/" hint="CDSware BibUpload Admin" menu="admin-bibupload">
   <navbar:button id=webaccess txt="WebAccess Admin" url="<WEBURL>/admin/webaccess/" hint="CDSware Web Access Rights Admin" menu="admin-webaccess">
   <navbar:button id=webalert txt="WebAlert Admin" url="<WEBURL>/admin/webalert/" hint="CDSware WebAlert Admin" menu="admin-webalert">
   <navbar:button id=webbasket txt="WebBasket Admin" url="<WEBURL>/admin/webbasket/" hint="CDSware WebBasket Admin" menu="admin-webbasket">
   <navbar:button id=webcomment txt="WebComment Admin" url="<WEBURL>/admin/webcomment/" hint="CDSware WebComment Admin" menu="admin-webcomment">
+  <navbar:button id=webmessage txt="WebMessage Admin" url="<WEBURL>/admin/webmessage/" hint="CDSware WebMessage Admin" menu="admin-webmessage">
   <navbar:button id=websearch txt="WebSearch Admin" url="<WEBURL>/admin/websearch/" hint="CDSware Web Search Interface Admin" menu="admin-websearch">
   <navbar:button id=websession txt="WebSession Admin" url="<WEBURL>/admin/websession/" hint="CDSware WebSession Admin" menu="admin-websession">
   <navbar:button id=webstat txt="WebStat Admin" url="<WEBURL>/admin/webstat/" hint="CDSware WebStat Admin" menu="admin-webstat">
   <navbar:button id=webstyle txt="WebStyle Admin" url="<WEBURL>/admin/webstyle/" hint="CDSware WebStyle Admin" menu="admin-webstyle">
   <navbar:button id=websubmit txt="WebSubmit Admin" url="<WEBURL>/admin/websubmit/" hint="CDSware Web Submit Interface Admin" menu="admin-websubmit">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
   <navbar:epilog type=S> </td><td></td></tr></navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-howto:
 <navbar:define name=admin-howto
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=howto_marc txt="HOWTO MARC" url="<WEBURL>/admin/howto/marc.html" hint="Admin's HOWTO Guides - How to MARC your medatada">
   <navbar:button id=howto_migrate txt="HOWTO Migrate" url="<WEBURL>/admin/howto/migrate.html" hint="Admin's HOWTO Guides - How to Migrate your old documents into CDSware">
   <navbar:button id=howto_run txt="HOWTO Run" url="<WEBURL>/admin/howto/run.html" hint="Admin's HOWTO Guides - How to Run your CDSware installation day-by-day">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibconvert:
 <navbar:define name=admin-bibconvert
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=bibconvert-admin-guide txt="Guide" url="<WEBURL>/admin/bibconvert/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibedit:
 <navbar:define name=admin-bibedit
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=bibedit-admin-interface txt="Interface" url="<WEBURL>/admin/bibedit/bibeditadmin.py">
   <navbar:button id=bibedit-admin-guide txt="Guide" url="<WEBURL>/admin/bibedit/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibformat:
 <navbar:define name=admin-bibformat
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=BEH_display txt="Behaviours" url="<WEBURL>/admin/bibformat/BEH_display.php" hint="BibFormat Admin - Behaviours">
   <navbar:button id=OAIER_display txt="Extraction&nbsp;Rules" url="<WEBURL>/admin/bibformat/OAIER_display.php" hint="BibFormat Admin - Extraction Rules">
   <navbar:button id=LINK_display txt="Link Rules" url="<WEBURL>/admin/bibformat/LINK_display.php" hint="BibFormat Admin - Link Rules">
   <navbar:button id=LINK_FORMAT_display txt="File Formats" url="<WEBURL>/admin/bibformat/LINK_FORMAT_display.php" hint="BibFormat Admin - File Formats">
   <navbar:button id=UDF_display txt="UDFs" url="<WEBURL>/admin/bibformat/UDF_display.php" hint="BibFormat Admin - User Defined Functions">
   <navbar:button id=FORMAT_display txt="Formats" url="<WEBURL>/admin/bibformat/FORMAT_display.php" hint="BibFormat Admin - Formats">
   <navbar:button id=KB_display txt="KBs" url="<WEBURL>/admin/bibformat/KB_display.php" hint="BibFormat Admin - Knowledge Bases">
   <navbar:button id=test txt="Execution Test" url="<WEBURL>/admin/bibformat/test.php" hint="BibFormat Admin - Execution Test">
   <navbar:button id=BIBREFORMAT_display txt="Reformat&nbsp;Records" url="<WEBURL>/admin/bibformat/BIBREFORMAT_display.php" hint="BibFormat Admin - Reformat Records">
   <navbar:button id=bibformat-guide txt="Guide" url="<WEBURL>/admin/bibformat/guide.html" hint="BibFormat Admin - Guide">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibharvest:
 <navbar:define name=admin-bibharvest
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=bibharvest-admin-interface txt="Interface" url="<WEBURL>/admin/bibharvest/bibharvestadmin.py">
   <navbar:button id=bibharvest-admin-guide txt="Guide" url="<WEBURL>/admin/bibharvest/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibindex:
 <navbar:define name=admin-bibindex
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=bibindex-admin-interface txt="Indexes" url="<WEBURL>/admin/bibindex/bibindexadmin.py/index">
   <navbar:button id=bibindex-admin-interface txt="Fields" url="<WEBURL>/admin/bibindex/bibindexadmin.py/field">
   <navbar:button id=bibindex-admin-guide txt="Guide" url="<WEBURL>/admin/bibindex/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibrank:
 <navbar:define name=admin-bibrank
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=bibrank-admin-interface txt="Interface" url="<WEBURL>/admin/bibrank/bibrankadmin.py">
   <navbar:button id=bibrank-admin-guide txt="Guide" url="<WEBURL>/admin/bibrank/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibsched:
 <navbar:define name=admin-bibsched
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=bibsched-admin-guide txt="Guide" url="<WEBURL>/admin/bibsched/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-bibupload:
 <navbar:define name=admin-bibupload
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=bibupload-admin-guide txt="Guide" url="<WEBURL>/admin/bibupload/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-webaccess:
 <navbar:define name=admin-webaccess
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=webaccess-admin-manager txt="Manager" url="<WEBURL>/admin/webaccess/webaccessadmin.py">
   <navbar:button id=webaccess-admin-delegator txt="Delegator" url="<WEBURL>/admin/webaccess/webaccessadmin.py/delegate_startarea">
   <navbar:button id=webaccess-admin-accounts txt="Accounts" url="<WEBURL>/admin/webaccess/webaccessadmin.py/manageaccounts">
   <navbar:button id=webaccess-admin-guide txt="Guide" url="<WEBURL>/admin/webaccess/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-webalert:
 <navbar:define name=admin-webalert
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=webalert-admin-guide txt="Guide" url="<WEBURL>/admin/webalert/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-webbasket:
 <navbar:define name=admin-webbasket
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=webbasket-admin-guide txt="Guide" url="<WEBURL>/admin/webbasket/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-webcomment:
 <navbar:define name=admin-webcomment
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=webcomment-admin-interface txt="Interface" url="<WEBURL>/admin/webcomment/webcommentadmin.py">
   <navbar:button id=webcomment-admin-guide txt="Guide" url="<WEBURL>/admin/webcomment/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
+## navbar admin-webmessage:
+<navbar:define name=admin-webmessage
+        imgbase="img/" urlbase="$(ROOT)">
+  <navbar:header>
+    <table class=adminbox>
+  </navbar:header>
+
+  <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
+
+  <navbar:button id=webmessage-admin-guide txt="Guide" url="<WEBURL>/admin/webmessage/guide.html">
+
+  <navbar:epilog> </td><td></td></tr> </navbar:epilog>
+
+  <navbar:footer>
+    </table>
+  </navbar:footer>
+</navbar:define>
+
 ## navbar admin-websearch:
 <navbar:define name=admin-websearch
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=websearch-admin-interface txt="Interface" url="<WEBURL>/admin/websearch/websearchadmin.py">
   <navbar:button id=websearch-admin-guide txt="Guide" url="<WEBURL>/admin/websearch/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-websession:
 <navbar:define name=admin-websession
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=websession-admin-guide txt="Guide" url="<WEBURL>/admin/websession/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-webstyle:
 <navbar:define name=admin-webstyle
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=webstyle-admin-guide txt="Guide" url="<WEBURL>/admin/webstyle/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-websubmit:
 <navbar:define name=admin-websubmit
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=websubmit_newdoctype txt="New&nbsp;Doctype" url="<WEBURL>/admin/websubmit/newDoctypeEDS.php" hint="New Type of Document">
   <navbar:button id=websubmit_deldoctype txt="Remove&nbsp;Doctype" url="<WEBURL>/admin/websubmit/removeDoctypeEDS.php" hint="Remove Type of Document">
   <navbar:button id=websubmit_listactions txt="Available&nbsp;Actions" url="<WEBURL>/admin/websubmit/allActionsEDS.php" hint="List Available Actions">
   <navbar:button id=websubmit_listchecks txt="Available&nbsp;Javascript&nbsp;Checks" url="<WEBURL>/admin/websubmit/allChecksEDS.php" hint="List Available Javascript Checking functions">
   <navbar:button id=websubmit_listelements txt="Available&nbsp;Element&nbsp;Descriptions" url="<WEBURL>/admin/websubmit/allElementsEDS.php" hint="List Available Element Descriptions">
   <navbar:button id=websubmit_listfunctions txt="Available&nbsp;Functions" url="<WEBURL>/admin/websubmit/listFunctions.php" hint="List Available Functions">
   <navbar:button id=websubmit_organise txt="Organise&nbsp;Main&nbsp;Page" url="<WEBURL>/admin/websubmit/editCatalogues.php" hint="Main Page Organisation">
   <navbar:button id=websubmit-admin-guide txt="Guide" url="<WEBURL>/admin/websubmit/guide/" hint="Guide">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 ## navbar admin-webstat:
 <navbar:define name=admin-webstat
         imgbase="img/" urlbase="$(ROOT)">
   <navbar:header>
     <table class=adminbox>
   </navbar:header>
 
   <navbar:prolog><tr valign=top><td></td><td class=adminboxbody> &nbsp;&nbsp;&nbsp;</navbar:prolog>
 
   <navbar:button id=webstat-admin-guide txt="Guide" url="<WEBURL>/admin/webstat/guide.html">
 
   <navbar:epilog> </td><td></td></tr> </navbar:epilog>
 
   <navbar:footer>
     </table>
   </navbar:footer>
 </navbar:define>
 
 
 ## End of file.  Please return to "config.wml" file, and the main CDSware
 ## source directory, and type "make clean && make".