diff --git a/pom.xml b/pom.xml
index 68aacaac..72d7d5d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
     <groupId>davmail</groupId>
     <artifactId>davmail</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
     <name>davmail</name>
     <url>http://www.sourceforge.net/projects/davmail</url>
     <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
+        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).
@@ -63,15 +63,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>oqube</id>
-            <name>javax additional repository</name>
-            <layout>default</layout>
-            <url>http://www.oqube.com/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
     </repositories>
     <dependencies>
         <dependency>
@@ -97,19 +88,24 @@
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
-            <artifactId>javamail</artifactId>
+            <artifactId>mail</artifactId>
             <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
-            <artifactId>jaf</artifactId>
-            <version>1.1</version>
+            <artifactId>activation</artifactId>
+             <version>1.1</version>            
         </dependency>
         <dependency>
             <groupId>swt</groupId>
             <artifactId>swt</artifactId>
             <version>3.3</version>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/java</sourceDirectory>
@@ -127,7 +123,7 @@
     <distributionManagement>
         <site>
             <id>website</id>
-            <url>scpexe://web.sourceforge.net/home/groups/d/da/davmail/htdocs</url>
+            <url>scp://web.sourceforge.net/home/groups/d/da/davmail/htdocs</url>
         </site>
     </distributionManagement>
     <reporting>
diff --git a/src/site/resources/images/davmailSettings.png b/src/site/resources/images/davmailSettings.png
index b3670225..bc7f48ed 100644
Binary files a/src/site/resources/images/davmailSettings.png and b/src/site/resources/images/davmailSettings.png differ
diff --git a/src/site/site.xml b/src/site/site.xml
index 1e5ddbd0..96ed14fb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="Maven">
+    <version position="left"/>
+    
     <bannerLeft>
         <name>SourceForge</name>
         <src>http://sflogo.sourceforge.net/sflogo.php?group_id=184600&amp;type=2</src>
@@ -12,12 +14,12 @@
     <body>
 
         <menu name="Quick Links">
-            <item name="About" href="/index.html"/>
-            <item name="Download" href="http://sourceforge.net/project/platformdownload.php?group_id=184600"/>
+            <item name="Home" href="/index.html"/>
             <item name="Windows Setup" href="/windowssetup.html"/>
             <item name="Linux Setup" href="/linuxsetup.html"/>
             <item name="Server Setup" href="/serversetup.html"/>
             <item name="Getting Started" href="/gettingstarted.html"/>
+            <item name="Download" href="http://sourceforge.net/project/platformdownload.php?group_id=184600"/>
             <item name="SourceForge site" href="http://sourceforge.net/projects/davmail"/>
         </menu>
 
diff --git a/src/site/xdoc/gettingstarted.xml b/src/site/xdoc/gettingstarted.xml
index cda45ef7..d0d97fbb 100644
--- a/src/site/xdoc/gettingstarted.xml
+++ b/src/site/xdoc/gettingstarted.xml
@@ -18,7 +18,7 @@
                 <img src="images/davmailSettings.png"/>
             </div>
             <p>
-                The following table describes the main options :
+                The following table describes the main and advanced options :
                 <table>
                     <tr>
                         <th>Parameter</th>
@@ -50,6 +50,11 @@
                         <td>Allow remote connections to the gateway (server mode)</td>
                         <td>false</td>
                     </tr>
+                     <tr>
+                        <td>Bind Address</td>
+                        <td>Bind only to the specified network address</td>
+                        <td>false</td>
+                    </tr>
                 </table>
             </p>
             <p>The bottom panel can be activated to set an HTTP proxy and associated credentials if needed</p>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
new file mode 100644
index 00000000..2b90d3a7
--- /dev/null
+++ b/src/site/xdoc/index.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<document>
+
+    <properties>
+        <title>DavMail Gateway</title>
+        <author email="mguessan@free.fr">Mickael Guessant</author>
+    </properties>
+
+    <body>
+
+        <section name="About">
+            <p>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).
+            </p>
+            <div style="width: 100%;text-align: center">
+                <img src="images/ubuntutray.png"/>
+            </div>
+        </section>
+        <section name="Download">
+            <p>Download latest DavMail Gateway release from
+                <a href="http://sourceforge.net/project/platformdownload.php?group_id=184600">
+                    SourceForge DavMail Gateway Files
+                </a>
+            </p>
+        </section>
+    </body>
+</document>
\ No newline at end of file
diff --git a/src/site/xdoc/serversetup.xml b/src/site/xdoc/serversetup.xml
index de6e3d28..e515bb12 100644
--- a/src/site/xdoc/serversetup.xml
+++ b/src/site/xdoc/serversetup.xml
@@ -9,7 +9,7 @@
 
     <body>
 
-        <section name="DavMail Setup as a server">
+        <section name="DavMail Setup as a standalone server">
             <p>Prerequisite : Sun J2SE 1.5 or 1.6.
             </p>
 
@@ -39,6 +39,7 @@ davmail.proxyPort=
 davmail.proxyUser=
 davmail.proxyPassword=
 davmail.server=true
+davmail.bindAddress=
             </source>
             <p>See
                 <a href="gettingstarted.html">Getting started</a>
@@ -52,10 +53,35 @@ davmail.server=true
             <p>Then check messages:
                 <source>tail -f nohup.out</source>
             </p>
-            <p>Proceed with client configuration:
-                <a href="gettingstarted.html">Getting started</a>
-            </p>
         </section>
 
+        <section name="DavMail Setup as a JEE Web Application">
+            <p>Prerequisites : Sun J2SE 1.5 or 1.6 and any JEE compliant web container 
+            </p>
+
+            <p>Davmail Gateway can now be deployed in any JEE application server using
+                the war package. In this mode, DavMail listener threads run inside the
+                application server and follow the web application lifecycle (start,
+                stop, deploy, undeploy). The following items describe Tomcat deployment,
+                details will vary according to the specific application server available.
+            </p>
+
+            <p>Download the war DavMail package from Sourceforge <code>davmail-*.war</code>,
+                and deploy it inside the application server. In Tomcat, this means copy the
+                war file to the webapps directory. If Tomcat is started and automatic
+                deployment enabled (this is the default configuration), the package is
+                automatically uncompressed and started.
+            </p>
+            <p>The davmail.properties configuration file is then available under
+                <code>davmail-*/WEB-INF/classes</code>.
+            </p>
+            
+            <p>See above and
+                <a href="gettingstarted.html">Getting started</a>
+                for more information on
+                the options. Make sure davmail.server is set to true (no icon tray) and allow
+                remote connections: davmail.allowRemote=true.
+            </p>
+        </section>
     </body>
 </document>
\ No newline at end of file

Parameter	Allow remote connections to the gateway (server mode)	false
Bind Address	Bind only to the specified network address	false