diff --git a/build.xml b/build.xml
index 9fdad7b6..95689759 100644
--- a/build.xml
+++ b/build.xml
@@ -142,15 +142,22 @@
             <version upstream="${release}"/>
             <maintainer email="mguessan@free.fr" name="Mickaël Guessant"/>
             <description synopsis="DavMail POP/IMAP/SMTP/Caldav/LDAP Exchange Gateway">
-                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.
+                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>
diff --git a/pom.xml b/pom.xml
index 3323696c..189b7d17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,19 +8,27 @@
     <version>3.6.4</version>
     <name>DavMail POP/IMAP/SMTP/Caldav/LDAP Exchange Gateway</name>
     <organization>
-		<name>Mickaël Guessant</name>
-	</organization>
+        <name>Mickaël Guessant</name>
+    </organization>
     <url>http://www.sourceforge.net/projects/davmail</url>
     <inceptionYear>2001</inceptionYear>
     <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 to allow recipient address completion in mail compoze
-        window and full calendar support with attendees free/busy display.
+        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).
     </description>
     <developers>
         <developer>
@@ -169,7 +177,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-              <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-log4j12</artifactId>
             <version>1.3.1</version>
         </dependency>
         <dependency>
@@ -189,7 +197,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>javax.jms</groupId>
-		    <artifactId>jms</artifactId>
+                    <artifactId>jms</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>com.sun.jdmk</groupId>
@@ -237,11 +245,11 @@
     </dependencies>
     <pluginRepositories>
         <pluginRepository>
-          <id>apache.snapshots</id>
-          <url>http://repository.apache.org/snapshots</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
+            <id>apache.snapshots</id>
+            <url>http://repository.apache.org/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
         </pluginRepository>
     </pluginRepositories>
     <build>
@@ -256,10 +264,10 @@
                 </configuration>
             </plugin>
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<version>2.1-SNAPSHOT</version>
-			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.1-SNAPSHOT</version>
+            </plugin>
         </plugins>
     </build>
     <distributionManagement>