diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 30443d02..46520f79 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -14,14 +14,11 @@
                 <tr>
                     <td>
                         <p>Ever wanted to get rid of Outlook ? DavMail is a POP/IMAP/SMTP/Caldav/LDAP exchange gateway
-                            allowing
-                            users to use any mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with
-                            an Exchange
-                            server, even from the internet or behind a firewall through Outlook Web Access. DavMail now
-                            includes an
-                            LDAP gateway to Exchange global address book to allow recipient address completion in mail
-                            compoze
-                            window and full calendar support with attendees free/busy display.
+                            allowing users to use any mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with
+                            an Exchange server, even from the internet or behind a firewall through Outlook Web Access.
+                            DavMail now includes an LDAP gateway to Exchange global address book and user personal contacts
+                            to allow recipient address completion in mail compose window and full calendar support
+                            with attendees free/busy display.
                         </p>
                         <div style="width: 100%;text-align: center">
                             <img src="images/davmailArchitecture.png" alt="DavMail Architecture" width="550"
@@ -29,16 +26,15 @@
                         </div>
                         <p>The main goal of DavMail is to provide standard compliant protocols in front of proprietary
                             Exchange. This means LDAP for address book, SMTP to send messages, IMAP to browse messages
-                            on the
-                            server in any folder, POP to retrieve inbox messages only and Caldav for calendar support.
+                            on the server in any folder, POP to retrieve inbox messages only and Caldav for calendar support.
                             Thus any standard compliant client can be used with Microsoft Exchange.
                         </p>
-                        <p>
-                            DavMail gateway is implemented in java and should run on any platform. Releases are tested
-                            on Windows,
-                            Linux (Ubuntu) and Mac OSX. Tray does not work on MacOS and is replaced with a full frame.
-                            Tested successfully with the Iphone (gateway running on a server).
+                        <p>DavMail gateway is implemented in java and should run on any platform. Releases are tested
+                            on Windows, Linux (Ubuntu) and Mac OSX. Tested successfully with the Iphone
+                            (gateway running on a server).
                         </p>
+                        <p>DavMail will soon also support the CardDav protocol to sync address books. This new feature
+                        is sponsored by french <a href="http://www.defense.gouv.fr/dga/">DGA</a> through project <a href="http://www.trustedbird.org">Trustedbird</a></p>
                     </td>
                     <td>
                         <a class="download" href="download.html">
diff --git a/src/site/xdoc/roadmap.xml b/src/site/xdoc/roadmap.xml
index 343ed26f..2233f980 100644
--- a/src/site/xdoc/roadmap.xml
+++ b/src/site/xdoc/roadmap.xml
@@ -22,6 +22,7 @@
                 <ul>
                     <li>Fix JavaMail client IMAP support</li>
                     <li>Create a new RPM package with redline rpm ant task</li>
+                    <li>Filter private events on shared calendars (Exchange bug)</li>
                 </ul>
             </subsection>
             <subsection name="3.7.0">
@@ -29,13 +30,14 @@
                     <strong>Next minor release</strong>
                 </p>
                 <ul>
+                    <li>Implement CardDav protocol to sync address books. This new feature
+                        is sponsored by the french DGA through project trustedbird
+                    </li>
                     <li>Implement Caldav attachments</li>
                     <li>Implement hide from Dock option on OSX</li>
                     <li>Implement multiple mailbox access over IMAP with domain/user/mailbox:
                         http://msexchangeteam.com/archive/2004/03/31/105275.aspx
                     </li>
-                    <li>Filter private events on shared calendars (Exchange bug)
-                    </li>
                     <li>Implement MKCALENDAR</li>
                 </ul>
             </subsection>
diff --git a/src/web/WEB-INF/web.xml b/src/web/WEB-INF/web.xml
index 5e2c3558..557b519a 100644
--- a/src/web/WEB-INF/web.xml
+++ b/src/web/WEB-INF/web.xml
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
 		  http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-           version="2.5">
-     <description>
-        Ever wanted to get rid of Outlook ? DavMail is a POP/SMTP exchange gateway allowing
-        users to use any mail client (e.g. Thunderbird) with an Exchange server, even from the internet
-        through Outlook Web Access. DavMail gateway is implemented in java and should run on
-        any platform. Releases are tested on Windows and Linux (Ubuntu). MacOS support is currently
-        limited to server (headless) mode. Tested successfully with the Iphone (gateway running on a
-        server).
+         version="2.5">
+    <description>
+        Ever wanted to get rid of Outlook ? DavMail is a POP/IMAP/SMTP/Caldav/LDAP exchange gateway
+        allowing users to use any mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with
+        an Exchange server, even from the internet or behind a firewall through Outlook Web Access.
+        DavMail now includes an LDAP gateway to Exchange global address book and user personal contacts
+        to allow recipient address completion in mail compose window and full calendar support
+        with attendees free/busy display.
+        The main goal of DavMail is to provide standard compliant protocols in front of proprietary
+        Exchange. This means LDAP for address book, SMTP to send messages, IMAP to browse messages
+        on the server in any folder, POP to retrieve inbox messages only and Caldav for calendar support.
+        Thus any standard compliant client can be used with Microsoft Exchange.
+        DavMail gateway is implemented in java and should run on any platform. Releases are tested on Windows,
+        Linux (Ubuntu) and Mac OSX. Tray does not work on MacOS and is replaced with a full frame.
+        Tested successfully with the Iphone (gateway running on a server).
+        DavMail gateway is implemented in java and should run on any platform. Releases are tested
+        on Windows, Linux (Ubuntu) and Mac OSX. Tested successfully with the Iphone
+        (gateway running on a server).
+
+        http://davmail.sourceforge.net
     </description>
     <listener>
         <listener-class>davmail.web.DavGatewayServletContextListener</listener-class>