diff --git a/src/java/davmail/exchange/ews/AttributeOption.java b/src/java/davmail/exchange/ews/AttributeOption.java
index e0efaeb2..377b5085 100644
--- a/src/java/davmail/exchange/ews/AttributeOption.java
+++ b/src/java/davmail/exchange/ews/AttributeOption.java
@@ -30,11 +30,13 @@ public abstract class AttributeOption extends Option {
         super(name, value);
     }
 
+    /**
+     * @inheritDoc
+     */
     public void appendTo(StringBuilder buffer) {
         buffer.append(' ').append(name).append("=\"").append(value).append('"');
     }
 
-
     /**
      * @inheritDoc
      */
diff --git a/src/java/davmail/exchange/ews/BaseShape.java b/src/java/davmail/exchange/ews/BaseShape.java
index 50d48720..fd608287 100644
--- a/src/java/davmail/exchange/ews/BaseShape.java
+++ b/src/java/davmail/exchange/ews/BaseShape.java
@@ -18,9 +18,6 @@
  */
 package davmail.exchange.ews;
 
-import java.io.IOException;
-import java.io.Writer;
-
 /**
  * Item or folder base shape.
  */
diff --git a/src/java/davmail/exchange/ews/ContainmentComparison.java b/src/java/davmail/exchange/ews/ContainmentComparison.java
index e6b641d0..84e77c0d 100644
--- a/src/java/davmail/exchange/ews/ContainmentComparison.java
+++ b/src/java/davmail/exchange/ews/ContainmentComparison.java
@@ -22,7 +22,7 @@ package davmail.exchange.ews;
  * Contains comparison mode.
  */
 public class ContainmentComparison extends AttributeOption {
-     private ContainmentComparison(String value) {
+    private ContainmentComparison(String value) {
         super("ContainmentComparison", value);
     }
 
diff --git a/src/java/davmail/exchange/ews/ContainmentMode.java b/src/java/davmail/exchange/ews/ContainmentMode.java
index 18dd8191..0aeb0022 100644
--- a/src/java/davmail/exchange/ews/ContainmentMode.java
+++ b/src/java/davmail/exchange/ews/ContainmentMode.java
@@ -34,7 +34,9 @@ public class ContainmentMode extends AttributeOption {
      * Starts with.
      */
     public static final ContainmentMode Prefixed = new ContainmentMode("Prefixed");
-
+    /**
+     * Contains
+     */
     public static final ContainmentMode Substring = new ContainmentMode("Substring");
     public static final ContainmentMode PrefixOnWords = new ContainmentMode("PrefixOnWords");
     public static final ContainmentMode ExactPhrase = new ContainmentMode("ExactPhrase");
diff --git a/src/java/davmail/exchange/ews/CopyItemMethod.java b/src/java/davmail/exchange/ews/CopyItemMethod.java
index 84d031b0..1d0d7f8b 100644
--- a/src/java/davmail/exchange/ews/CopyItemMethod.java
+++ b/src/java/davmail/exchange/ews/CopyItemMethod.java
@@ -22,6 +22,12 @@ package davmail.exchange.ews;
  * Copy item to another folder.
  */
 public class CopyItemMethod extends EWSMethod {
+    /**
+     * Copy item method.
+     *
+     * @param itemId     item id
+     * @param toFolderId target folder id
+     */
     public CopyItemMethod(ItemId itemId, FolderId toFolderId) {
         super("Item", "CopyItem");
         this.itemId = itemId;
diff --git a/src/java/davmail/exchange/ews/CreateFolderMethod.java b/src/java/davmail/exchange/ews/CreateFolderMethod.java
index ea715950..4ea01d8e 100644
--- a/src/java/davmail/exchange/ews/CreateFolderMethod.java
+++ b/src/java/davmail/exchange/ews/CreateFolderMethod.java
@@ -22,6 +22,12 @@ package davmail.exchange.ews;
  * Create Folder method.
  */
 public class CreateFolderMethod extends EWSMethod {
+    /**
+     * Update folder method.
+     *
+     * @param parentFolderId parent folder id
+     * @param item           folder item
+     */
     public CreateFolderMethod(FolderId parentFolderId, Item item) {
         super("Folder", "CreateFolder");
         this.parentFolderId = parentFolderId;
diff --git a/src/java/davmail/exchange/ews/CreateItemMethod.java b/src/java/davmail/exchange/ews/CreateItemMethod.java
index de7e4334..d486fd09 100644
--- a/src/java/davmail/exchange/ews/CreateItemMethod.java
+++ b/src/java/davmail/exchange/ews/CreateItemMethod.java
@@ -22,6 +22,13 @@ package davmail.exchange.ews;
  * Create Item method.
  */
 public class CreateItemMethod extends EWSMethod {
+    /**
+     * Create exchange item.
+     *
+     * @param messageDisposition save or send option
+     * @param savedItemFolderId  saved item folder id
+     * @param item               item content
+     */
     public CreateItemMethod(MessageDisposition messageDisposition, FolderId savedItemFolderId, EWSMethod.Item item) {
         super("Item", "CreateItem");
         this.savedItemFolderId = savedItemFolderId;
@@ -29,6 +36,14 @@ public class CreateItemMethod extends EWSMethod {
         addMethodOption(messageDisposition);
     }
 
+    /**
+     * Create exchange item.
+     *
+     * @param messageDisposition     save or send option
+     * @param sendMeetingInvitations send invitation option
+     * @param savedItemFolderId      saved item folder id
+     * @param item                   item content
+     */
     public CreateItemMethod(MessageDisposition messageDisposition, SendMeetingInvitations sendMeetingInvitations, FolderId savedItemFolderId, EWSMethod.Item item) {
         super("Item", "CreateItem");
         this.savedItemFolderId = savedItemFolderId;
@@ -36,5 +51,5 @@ public class CreateItemMethod extends EWSMethod {
         addMethodOption(messageDisposition);
         addMethodOption(sendMeetingInvitations);
     }
-    
+
 }
diff --git a/src/java/davmail/exchange/ews/DeleteFolderMethod.java b/src/java/davmail/exchange/ews/DeleteFolderMethod.java
index 7eced6ea..6ccafe5f 100644
--- a/src/java/davmail/exchange/ews/DeleteFolderMethod.java
+++ b/src/java/davmail/exchange/ews/DeleteFolderMethod.java
@@ -22,6 +22,11 @@ package davmail.exchange.ews;
  * Delete Folder method.
  */
 public class DeleteFolderMethod extends EWSMethod {
+    /**
+     * Delete folder method.
+     *
+     * @param folderId folder id
+     */
     public DeleteFolderMethod(FolderId folderId) {
         super("Folder", "DeleteFolder");
         this.folderId = folderId;
diff --git a/src/java/davmail/exchange/ews/DeleteItemMethod.java b/src/java/davmail/exchange/ews/DeleteItemMethod.java
index 6c8251df..79a006ca 100644
--- a/src/java/davmail/exchange/ews/DeleteItemMethod.java
+++ b/src/java/davmail/exchange/ews/DeleteItemMethod.java
@@ -22,6 +22,12 @@ package davmail.exchange.ews;
  * Delete Item method.
  */
 public class DeleteItemMethod extends EWSMethod {
+    /**
+     * Delete item method.
+     *
+     * @param itemId     item id
+     * @param deleteType delete mode
+     */
     public DeleteItemMethod(ItemId itemId, DeleteType deleteType) {
         super("Item", "DeleteItem");
         addMethodOption(deleteType);
diff --git a/src/java/davmail/exchange/ews/Disposal.java b/src/java/davmail/exchange/ews/Disposal.java
index d17d5305..943b17c0 100644
--- a/src/java/davmail/exchange/ews/Disposal.java
+++ b/src/java/davmail/exchange/ews/Disposal.java
@@ -18,9 +18,6 @@
  */
 package davmail.exchange.ews;
 
-import java.io.IOException;
-import java.io.Writer;
-
 /**
  * Disposal.
  */
diff --git a/src/java/davmail/exchange/ews/EWSMethod.java b/src/java/davmail/exchange/ews/EWSMethod.java
index 90b69b78..07be64bd 100644
--- a/src/java/davmail/exchange/ews/EWSMethod.java
+++ b/src/java/davmail/exchange/ews/EWSMethod.java
@@ -66,6 +66,9 @@ public abstract class EWSMethod extends PostMethod {
 
     /**
      * Build EWS method
+     *
+     * @param itemType   item type
+     * @param methodName method name
      */
     public EWSMethod(String itemType, String methodName) {
         super("/ews/exchange.asmx");
@@ -226,6 +229,7 @@ public abstract class EWSMethod extends PostMethod {
     }
 
     protected void startChanges(Writer writer) throws IOException {
+        //noinspection VariableNotUsedInsideIf
         if (updates != null) {
             writer.write("<m:");
             writer.write(itemType);
@@ -248,6 +252,7 @@ public abstract class EWSMethod extends PostMethod {
 
 
     protected void endChanges(Writer writer) throws IOException {
+        //noinspection VariableNotUsedInsideIf
         if (updates != null) {
             writer.write("</t:");
             writer.write(itemType);
@@ -322,7 +327,13 @@ public abstract class EWSMethod extends PostMethod {
         return inputFactory;
     }
 
+    /**
+     * Item
+     */
     public static class Item extends HashMap<String, String> {
+        /**
+         * Item type.
+         */
         public String type;
         protected byte[] mimeContent;
         protected Set<FieldUpdate> fieldUpdates;
@@ -366,10 +377,21 @@ public abstract class EWSMethod extends PostMethod {
             writer.write(">");
         }
 
+        /**
+         * Field updates.
+         *
+         * @param fieldUpdates field updates
+         */
         public void setFieldUpdates(Set<FieldUpdate> fieldUpdates) {
             this.fieldUpdates = fieldUpdates;
         }
 
+        /**
+         * Get property value as int
+         *
+         * @param key property response name
+         * @return property value
+         */
         public int getInt(String key) {
             int result = 0;
             String value = get(key);
@@ -379,6 +401,12 @@ public abstract class EWSMethod extends PostMethod {
             return result;
         }
 
+        /**
+         * Get property value as long
+         *
+         * @param key property response name
+         * @return property value
+         */
         public long getLong(String key) {
             long result = 0;
             String value = get(key);
@@ -389,6 +417,12 @@ public abstract class EWSMethod extends PostMethod {
         }
 
 
+        /**
+         * Get property value as boolean
+         *
+         * @param key property response name
+         * @return property value
+         */
         public boolean getBoolean(String key) {
             boolean result = false;
             String value = get(key);
@@ -400,17 +434,34 @@ public abstract class EWSMethod extends PostMethod {
 
     }
 
+    /**
+     * Check method success.
+     *
+     * @throws EWSException on error
+     */
     public void checkSuccess() throws EWSException {
         if (errorDetail != null) {
             throw new EWSException(errorDetail + "\n request: " + new String(generateSoapEnvelope()));
         }
     }
 
+    /**
+     * Get response items.
+     *
+     * @return response items
+     * @throws EWSException on error
+     */
     public List<Item> getResponseItems() throws EWSException {
         checkSuccess();
         return responseItems;
     }
 
+    /**
+     * Get single response item.
+     *
+     * @return response item
+     * @throws EWSException on error
+     */
     public Item getResponseItem() throws EWSException {
         checkSuccess();
         if (responseItems != null && responseItems.size() == 1) {
@@ -420,6 +471,12 @@ public abstract class EWSMethod extends PostMethod {
         }
     }
 
+    /**
+     * Get response mime content.
+     *
+     * @return mime content
+     * @throws EWSException on error
+     */
     public byte[] getMimeContent() throws EWSException {
         checkSuccess();
         Item responseItem = getResponseItem();
@@ -509,13 +566,13 @@ public abstract class EWSMethod extends PostMethod {
             reader.next();
             if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
                 String tagLocalName = reader.getLocalName();
-                if (tagLocalName.equals("ExtendedFieldURI")) {
+                if ("ExtendedFieldURI".equals(tagLocalName)) {
                     propertyTag = getAttributeValue(reader, "PropertyTag");
                     // property name is in PropertyId with DistinguishedPropertySetId 
                     if (propertyTag == null) {
                         propertyTag = getAttributeValue(reader, "PropertyId");
                     }
-                } else if (tagLocalName.equals("Value")) {
+                } else if ("Value".equals(tagLocalName)) {
                     propertyValue = reader.getElementText();
                 }
             }
@@ -555,7 +612,7 @@ public abstract class EWSMethod extends PostMethod {
         Header contentTypeHeader = getResponseHeader("Content-Type");
         if (contentTypeHeader != null && "text/xml; charset=utf-8".equals(contentTypeHeader.getValue())) {
             responseItems = new ArrayList<Item>();
-            XMLStreamReader reader = null;
+            XMLStreamReader reader;
             try {
                 XMLInputFactory xmlInputFactory = getXmlInputFactory();
                 reader = xmlInputFactory.createXMLStreamReader(getResponseBodyAsStream());
diff --git a/src/java/davmail/exchange/ews/ExtendedFieldURI.java b/src/java/davmail/exchange/ews/ExtendedFieldURI.java
index 2ad0a93c..c7ee2dc2 100644
--- a/src/java/davmail/exchange/ews/ExtendedFieldURI.java
+++ b/src/java/davmail/exchange/ews/ExtendedFieldURI.java
@@ -40,27 +40,42 @@ public class ExtendedFieldURI implements FieldURI {
     protected int propertyId;
     protected PropertyType propertyType;
 
+    /**
+     * Create extended field uri.
+     *
+     * @param intPropertyTag property tag as int
+     * @param propertyType   property type
+     */
     public ExtendedFieldURI(int intPropertyTag, PropertyType propertyType) {
         this.propertyTag = "0x" + Integer.toHexString(intPropertyTag);
         this.propertyType = propertyType;
     }
 
+    /**
+     * Create extended field uri.
+     *
+     * @param distinguishedPropertySetId distinguished property set id
+     * @param propertyId                 property id
+     * @param propertyType               property type
+     */
     public ExtendedFieldURI(DistinguishedPropertySetType distinguishedPropertySetId, int propertyId, PropertyType propertyType) {
         this.distinguishedPropertySetId = distinguishedPropertySetId;
         this.propertyId = propertyId;
         this.propertyType = propertyType;
     }
 
+    /**
+     * Create extended field uri.
+     *
+     * @param distinguishedPropertySetId distinguished property set id
+     * @param propertyName               property name
+     */
     public ExtendedFieldURI(DistinguishedPropertySetType distinguishedPropertySetId, String propertyName) {
         this.distinguishedPropertySetId = distinguishedPropertySetId;
         this.propertyName = propertyName;
         this.propertyType = PropertyType.String;
     }
 
-    public String getPropertyTag() {
-        return propertyTag;
-    }
-
     public void appendTo(StringBuilder buffer) {
         buffer.append("<t:ExtendedFieldURI ");
         if (propertyTag != null) {
@@ -104,6 +119,11 @@ public class ExtendedFieldURI implements FieldURI {
         }
     }
 
+    /**
+     * Field name in EWS response.
+     *
+     * @return field name in response
+     */
     public String getResponseName() {
         if (propertyTag != null) {
             return propertyTag;
diff --git a/src/java/davmail/exchange/ews/Field.java b/src/java/davmail/exchange/ews/Field.java
index 30eab247..15e7a0d6 100644
--- a/src/java/davmail/exchange/ews/Field.java
+++ b/src/java/davmail/exchange/ews/Field.java
@@ -27,6 +27,9 @@ import java.util.Map;
 public class Field {
     protected static final Map<String, FieldURI> FIELD_MAP = new HashMap<String, FieldURI>();
 
+    private Field() {
+    }
+
     static {
         // items
         FIELD_MAP.put("etag", new ExtendedFieldURI(0x3008, ExtendedFieldURI.PropertyType.SystemTime));
@@ -37,7 +40,7 @@ public class Field {
         FIELD_MAP.put("permanenturl", new ExtendedFieldURI(0x670E, ExtendedFieldURI.PropertyType.String)); //PR_FLAT_URL_NAME
         FIELD_MAP.put("instancetype", new ExtendedFieldURI(ExtendedFieldURI.DistinguishedPropertySetType.PublicStrings, "urn:schemas:calendar:instancetype"));
 
-        FIELD_MAP.put("mimeContent", new UnindexedFieldURI("item:MimeContent"));        
+        FIELD_MAP.put("mimeContent", new UnindexedFieldURI("item:MimeContent"));
 
         // use PR_RECORD_KEY as unique key 
         FIELD_MAP.put("uid", new ExtendedFieldURI(0x0FF9, ExtendedFieldURI.PropertyType.Binary));
@@ -68,7 +71,7 @@ public class Field {
 
         FIELD_MAP.put("homepostaladdress", new ExtendedFieldURI(ExtendedFieldURI.DistinguishedPropertySetType.Address, 0x801A, ExtendedFieldURI.PropertyType.String));
         FIELD_MAP.put("otherpostaladdress", new ExtendedFieldURI(ExtendedFieldURI.DistinguishedPropertySetType.Address, 0x801C, ExtendedFieldURI.PropertyType.String));
-        FIELD_MAP.put("mailingaddressid", new ExtendedFieldURI(ExtendedFieldURI.DistinguishedPropertySetType.Address,0x8022, ExtendedFieldURI.PropertyType.String ));
+        FIELD_MAP.put("mailingaddressid", new ExtendedFieldURI(ExtendedFieldURI.DistinguishedPropertySetType.Address, 0x8022, ExtendedFieldURI.PropertyType.String));
         FIELD_MAP.put("workaddress", new ExtendedFieldURI(ExtendedFieldURI.DistinguishedPropertySetType.Address, 0x801B, ExtendedFieldURI.PropertyType.String));
 
         FIELD_MAP.put("alternaterecipient", new ExtendedFieldURI(ExtendedFieldURI.DistinguishedPropertySetType.PublicStrings, "urn:schemas:contacts:alternaterecipient"));
diff --git a/src/java/davmail/exchange/ews/FieldURI.java b/src/java/davmail/exchange/ews/FieldURI.java
index e29687d8..10e75ee9 100644
--- a/src/java/davmail/exchange/ews/FieldURI.java
+++ b/src/java/davmail/exchange/ews/FieldURI.java
@@ -25,13 +25,17 @@ public interface FieldURI {
 
     /**
      * Append field to buffer
+     *
      * @param buffer current buffer
      */
     public void appendTo(StringBuilder buffer);
 
     /**
      * Append updated field value to buffer
-     * @param buffer current buffer
+     *
+     * @param buffer   current buffer
+     * @param itemType item type
+     * @param value    field value
      */
     public void appendValue(StringBuilder buffer, String itemType, String value);
 
diff --git a/src/java/davmail/exchange/ews/FieldUpdate.java b/src/java/davmail/exchange/ews/FieldUpdate.java
index 7123085f..c4be61a0 100644
--- a/src/java/davmail/exchange/ews/FieldUpdate.java
+++ b/src/java/davmail/exchange/ews/FieldUpdate.java
@@ -28,13 +28,27 @@ public class FieldUpdate {
     FieldURI fieldURI;
     String value;
 
+    /**
+     * Create field update with value.
+     *
+     * @param fieldURI target field
+     * @param value    field value
+     */
     public FieldUpdate(FieldURI fieldURI, String value) {
         this.fieldURI = fieldURI;
         this.value = value;
     }
 
+    /**
+     * Write field to request writer.
+     *
+     * @param itemType item type
+     * @param writer   request writer
+     * @throws IOException on error
+     */
     public void write(String itemType, Writer writer) throws IOException {
         String action;
+        //noinspection VariableNotUsedInsideIf
         if (value == null) {
             action = "Delete";
         } else {
diff --git a/src/java/davmail/exchange/ews/FindFolderMethod.java b/src/java/davmail/exchange/ews/FindFolderMethod.java
index 27a347d0..3c3ab226 100644
--- a/src/java/davmail/exchange/ews/FindFolderMethod.java
+++ b/src/java/davmail/exchange/ews/FindFolderMethod.java
@@ -28,9 +28,9 @@ public class FindFolderMethod extends EWSMethod {
     /**
      * Find Exchange Folder.
      *
-     * @param traversal      traversal type
-     * @param baseShape      base shape
-     * @param parentFolderId parent folder id
+     * @param traversal            traversal type
+     * @param baseShape            base shape
+     * @param parentFolderId       parent folder id
      * @param additionalProperties folder properties
      */
     public FindFolderMethod(FolderQueryTraversal traversal, BaseShape baseShape, FolderId parentFolderId, Set<FieldURI> additionalProperties) {
@@ -44,11 +44,11 @@ public class FindFolderMethod extends EWSMethod {
     /**
      * Find Exchange Folder.
      *
-     * @param traversal        traversal type
-     * @param baseShape        base shape
-     * @param parentFolderId   parent folder id
+     * @param traversal            traversal type
+     * @param baseShape            base shape
+     * @param parentFolderId       parent folder id
      * @param additionalProperties folder properties
-     * @param searchExpression search expression
+     * @param searchExpression     search expression
      */
     public FindFolderMethod(FolderQueryTraversal traversal, BaseShape baseShape, FolderId parentFolderId,
                             Set<FieldURI> additionalProperties, SearchExpression searchExpression) {
diff --git a/src/java/davmail/exchange/ews/FindItemMethod.java b/src/java/davmail/exchange/ews/FindItemMethod.java
index cc4e6810..7c252e7f 100644
--- a/src/java/davmail/exchange/ews/FindItemMethod.java
+++ b/src/java/davmail/exchange/ews/FindItemMethod.java
@@ -22,6 +22,13 @@ package davmail.exchange.ews;
  * EWS Find Item Method.
  */
 public class FindItemMethod extends EWSMethod {
+    /**
+     * Find item method.
+     *
+     * @param traversal      folder traversal mode
+     * @param baseShape      base item shape
+     * @param parentFolderId parent folder id
+     */
     public FindItemMethod(FolderQueryTraversal traversal, BaseShape baseShape, FolderId parentFolderId) {
         super("Item", "FindItem");
         this.traversal = traversal;
diff --git a/src/java/davmail/exchange/ews/FolderId.java b/src/java/davmail/exchange/ews/FolderId.java
index d7ff6285..0771444c 100644
--- a/src/java/davmail/exchange/ews/FolderId.java
+++ b/src/java/davmail/exchange/ews/FolderId.java
@@ -27,15 +27,23 @@ import java.io.Writer;
 public class FolderId extends Option {
     protected String changeKey;
 
+    /**
+     * Create FolderId with specified tag name.
+     *
+     * @param name      field tag name
+     * @param value     id value
+     * @param changeKey folder change key
+     */
     protected FolderId(String name, String value, String changeKey) {
         super(name, value);
         this.changeKey = changeKey;
     }
 
     /**
-     * Create FolderId option
+     * Create FolderId
      *
-     * @param value id value
+     * @param value     id value
+     * @param changeKey folder change key
      */
     public FolderId(String value, String changeKey) {
         super("t:FolderId", value);
@@ -48,7 +56,7 @@ public class FolderId extends Option {
      * @param item response item
      */
     public FolderId(EWSMethod.Item item) {
-        this(item.get("FolderId"),item.get("ChangeKey"));
+        this(item.get("FolderId"), item.get("ChangeKey"));
     }
 
 
diff --git a/src/java/davmail/exchange/ews/FolderQueryTraversal.java b/src/java/davmail/exchange/ews/FolderQueryTraversal.java
index 65872bdf..a8ec10d2 100644
--- a/src/java/davmail/exchange/ews/FolderQueryTraversal.java
+++ b/src/java/davmail/exchange/ews/FolderQueryTraversal.java
@@ -18,9 +18,6 @@
  */
 package davmail.exchange.ews;
 
-import java.io.IOException;
-import java.io.Writer;
-
 /**
  * Folder folderQueryTraversalType search mode.
  */
diff --git a/src/java/davmail/exchange/ews/GetFolderMethod.java b/src/java/davmail/exchange/ews/GetFolderMethod.java
index 1d3f20fa..b93b1e0e 100644
--- a/src/java/davmail/exchange/ews/GetFolderMethod.java
+++ b/src/java/davmail/exchange/ews/GetFolderMethod.java
@@ -25,6 +25,13 @@ import java.util.Set;
  */
 public class GetFolderMethod extends EWSMethod {
 
+    /**
+     * Get folder method.
+     *
+     * @param baseShape            base requested shape
+     * @param folderId             folder id
+     * @param additionalProperties additional requested properties
+     */
     public GetFolderMethod(BaseShape baseShape, FolderId folderId, Set<FieldURI> additionalProperties) {
         super("Folder", "GetFolder");
         this.baseShape = baseShape;
diff --git a/src/java/davmail/exchange/ews/GetItemMethod.java b/src/java/davmail/exchange/ews/GetItemMethod.java
index cb131468..86648b2f 100644
--- a/src/java/davmail/exchange/ews/GetItemMethod.java
+++ b/src/java/davmail/exchange/ews/GetItemMethod.java
@@ -22,6 +22,13 @@ package davmail.exchange.ews;
  * Get Item method.
  */
 public class GetItemMethod extends EWSMethod {
+    /**
+     * Get item method.
+     *
+     * @param baseShape          base requested shape
+     * @param itemId             item id
+     * @param includeMimeContent return mime content
+     */
     public GetItemMethod(BaseShape baseShape, ItemId itemId, boolean includeMimeContent) {
         super("Item", "GetItem");
         this.baseShape = baseShape;
diff --git a/src/java/davmail/exchange/ews/IndexedFieldURI.java b/src/java/davmail/exchange/ews/IndexedFieldURI.java
index b5f9130e..e5e6fadb 100644
--- a/src/java/davmail/exchange/ews/IndexedFieldURI.java
+++ b/src/java/davmail/exchange/ews/IndexedFieldURI.java
@@ -25,6 +25,11 @@ public class IndexedFieldURI implements FieldURI {
     protected String fieldURI;
     protected String fieldIndex;
 
+    /**
+     * Create indexed field uri.
+     * @param fieldURI base field uri
+     * @param fieldIndex field name 
+     */
     public IndexedFieldURI(String fieldURI, String fieldIndex) {
         this.fieldURI = fieldURI;
         this.fieldIndex = fieldIndex;
diff --git a/src/java/davmail/exchange/ews/InternetMessageHeaderFieldURI.java b/src/java/davmail/exchange/ews/InternetMessageHeaderFieldURI.java
index fc93079c..bb9f70b0 100644
--- a/src/java/davmail/exchange/ews/InternetMessageHeaderFieldURI.java
+++ b/src/java/davmail/exchange/ews/InternetMessageHeaderFieldURI.java
@@ -22,7 +22,12 @@ package davmail.exchange.ews;
  * Internet Message Header Field.
  */
 public class InternetMessageHeaderFieldURI extends IndexedFieldURI {
-    public InternetMessageHeaderFieldURI(String fieldIndex) {
-        super("item:InternetMessageHeader", fieldIndex);
+    /**
+     * Create header field for field name.
+     *
+     * @param fieldName header field name
+     */
+    public InternetMessageHeaderFieldURI(String fieldName) {
+        super("item:InternetMessageHeader", fieldName);
     }
 }
diff --git a/src/java/davmail/exchange/ews/ItemId.java b/src/java/davmail/exchange/ews/ItemId.java
index 4413f057..2779e220 100644
--- a/src/java/davmail/exchange/ews/ItemId.java
+++ b/src/java/davmail/exchange/ews/ItemId.java
@@ -49,20 +49,11 @@ public class ItemId {
         this.changeKey = item.get("ChangeKey");
     }
 
-    /**
-     * Create Item id.
-     *
-     * @param id item id
-     */
-    public ItemId(String id) {
-        this.id = id;
-    }
-
     /**
      * Write item id as XML.
      *
-     * @param writer
-     * @throws IOException
+     * @param writer request writer
+     * @throws IOException on error
      */
     public void write(Writer writer) throws IOException {
         writer.write("<t:ItemId Id=\"");
diff --git a/src/java/davmail/exchange/ews/MessageDisposition.java b/src/java/davmail/exchange/ews/MessageDisposition.java
index 9c9d0e46..433ba412 100644
--- a/src/java/davmail/exchange/ews/MessageDisposition.java
+++ b/src/java/davmail/exchange/ews/MessageDisposition.java
@@ -18,9 +18,6 @@
  */
 package davmail.exchange.ews;
 
-import java.io.IOException;
-import java.io.Writer;
-
 /**
  * MessageDisposition flag.
  */
diff --git a/src/java/davmail/exchange/ews/MoveFolderMethod.java b/src/java/davmail/exchange/ews/MoveFolderMethod.java
index 37ef792c..19bc4db0 100644
--- a/src/java/davmail/exchange/ews/MoveFolderMethod.java
+++ b/src/java/davmail/exchange/ews/MoveFolderMethod.java
@@ -22,6 +22,12 @@ package davmail.exchange.ews;
  * Create Folder method.
  */
 public class MoveFolderMethod extends EWSMethod {
+    /**
+     * Move folder to target folder.
+     *
+     * @param folderId   folder id
+     * @param toFolderId target folder id
+     */
     public MoveFolderMethod(FolderId folderId, FolderId toFolderId) {
         super("Folder", "MoveFolder");
         this.folderId = folderId;
diff --git a/src/java/davmail/exchange/ews/MoveItemMethod.java b/src/java/davmail/exchange/ews/MoveItemMethod.java
index 805c6255..e22d1350 100644
--- a/src/java/davmail/exchange/ews/MoveItemMethod.java
+++ b/src/java/davmail/exchange/ews/MoveItemMethod.java
@@ -22,6 +22,12 @@ package davmail.exchange.ews;
  * Move Item method.
  */
 public class MoveItemMethod extends EWSMethod {
+    /**
+     * Move item to target folder.
+     *
+     * @param itemId     item id
+     * @param toFolderId target folder id
+     */
     public MoveItemMethod(ItemId itemId, FolderId toFolderId) {
         super("Item", "MoveItem");
         this.itemId = itemId;
diff --git a/src/java/davmail/exchange/ews/MultipleOperandBooleanExpression.java b/src/java/davmail/exchange/ews/MultipleOperandBooleanExpression.java
deleted file mode 100644
index 3971e5b0..00000000
--- a/src/java/davmail/exchange/ews/MultipleOperandBooleanExpression.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * DavMail POP/IMAP/SMTP/CalDav/LDAP Exchange Gateway
- * Copyright (C) 2010  Mickael Guessant
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package davmail.exchange.ews;
-
-import java.io.IOException;
-import java.io.Writer;
-
-/**
- * Boolean search expression
- */
-public class MultipleOperandBooleanExpression implements SearchExpression {
-    public enum Operator {
-        And, Or, Not
-    }
-
-    private SearchExpression[] searchExpressions;
-    private Operator operator;
-
-    public MultipleOperandBooleanExpression(Operator operator, SearchExpression... searchExpressions) {
-        this.searchExpressions = searchExpressions;
-        this.operator = operator;
-    }
-
-    public void appendTo(StringBuilder buffer) {
-        buffer.append("<t:").append(operator.toString()).append('>');
-
-        for (SearchExpression searchExpression : searchExpressions) {
-            searchExpression.appendTo(buffer);
-        }
-
-        buffer.append("</t:").append(operator.toString()).append('>');
-    }
-}
diff --git a/src/java/davmail/exchange/ews/SendMeetingInvitations.java b/src/java/davmail/exchange/ews/SendMeetingInvitations.java
index b00c9f6c..5bbd7859 100644
--- a/src/java/davmail/exchange/ews/SendMeetingInvitations.java
+++ b/src/java/davmail/exchange/ews/SendMeetingInvitations.java
@@ -22,10 +22,10 @@ package davmail.exchange.ews;
  * Item update option.
  */
 public class SendMeetingInvitations extends AttributeOption {
-     private SendMeetingInvitations(String value) {
+    private SendMeetingInvitations(String value) {
         super("SendMeetingInvitations", value);
     }
-      
+
     public static final SendMeetingInvitations SendToNone = new SendMeetingInvitations("SendToNone");
     public static final SendMeetingInvitations SendOnlyToAll = new SendMeetingInvitations("SendOnlyToAll");
     public static final SendMeetingInvitations SendToAllAndSaveCopy = new SendMeetingInvitations("SendToAllAndSaveCopy");
diff --git a/src/java/davmail/exchange/ews/SendMeetingInvitationsOrCancellations.java b/src/java/davmail/exchange/ews/SendMeetingInvitationsOrCancellations.java
index 4bbe2144..83fd387a 100644
--- a/src/java/davmail/exchange/ews/SendMeetingInvitationsOrCancellations.java
+++ b/src/java/davmail/exchange/ews/SendMeetingInvitationsOrCancellations.java
@@ -22,10 +22,10 @@ package davmail.exchange.ews;
  * Item update option.
  */
 public class SendMeetingInvitationsOrCancellations extends AttributeOption {
-     private SendMeetingInvitationsOrCancellations(String value) {
+    private SendMeetingInvitationsOrCancellations(String value) {
         super("SendMeetingInvitationsOrCancellations", value);
     }
-      
+
     public static final SendMeetingInvitationsOrCancellations SendToNone = new SendMeetingInvitationsOrCancellations("SendToNone");
     public static final SendMeetingInvitationsOrCancellations SendOnlyToAll = new SendMeetingInvitationsOrCancellations("SendOnlyToAll");
     public static final SendMeetingInvitationsOrCancellations SendToAllAndSaveCopy = new SendMeetingInvitationsOrCancellations("SendToAllAndSaveCopy");
diff --git a/src/java/davmail/exchange/ews/TwoOperandExpression.java b/src/java/davmail/exchange/ews/TwoOperandExpression.java
index 1146f69e..19307deb 100644
--- a/src/java/davmail/exchange/ews/TwoOperandExpression.java
+++ b/src/java/davmail/exchange/ews/TwoOperandExpression.java
@@ -20,9 +20,6 @@ package davmail.exchange.ews;
 
 import davmail.util.StringUtil;
 
-import java.io.IOException;
-import java.io.Writer;
-
 /**
  * Two operand expression.
  */
diff --git a/src/java/davmail/exchange/ews/UnindexedFieldURI.java b/src/java/davmail/exchange/ews/UnindexedFieldURI.java
index 8a96f3d4..0784c9a8 100644
--- a/src/java/davmail/exchange/ews/UnindexedFieldURI.java
+++ b/src/java/davmail/exchange/ews/UnindexedFieldURI.java
@@ -25,13 +25,18 @@ public class UnindexedFieldURI implements FieldURI {
     protected final String fieldURI;
     protected final String fieldName;
 
+    /**
+     * Create unindexed field URI.
+     *
+     * @param fieldURI field name
+     */
     public UnindexedFieldURI(String fieldURI) {
         this.fieldURI = fieldURI;
         int colonIndex = fieldURI.indexOf(':');
         if (colonIndex < 0) {
             fieldName = fieldURI;
         } else {
-            fieldName = fieldURI.substring(colonIndex+1);
+            fieldName = fieldURI.substring(colonIndex + 1);
         }
     }
 
diff --git a/src/java/davmail/exchange/ews/UpdateFolderMethod.java b/src/java/davmail/exchange/ews/UpdateFolderMethod.java
index 36169d28..c3c9a659 100644
--- a/src/java/davmail/exchange/ews/UpdateFolderMethod.java
+++ b/src/java/davmail/exchange/ews/UpdateFolderMethod.java
@@ -24,6 +24,12 @@ import java.util.Set;
  * Update Folder method.
  */
 public class UpdateFolderMethod extends EWSMethod {
+    /**
+     * Update folder options.
+     *
+     * @param folderId folder id
+     * @param updates  folder properties updates
+     */
     public UpdateFolderMethod(FolderId folderId, Set<FieldUpdate> updates) {
         super("Folder", "UpdateFolder");
         this.folderId = folderId;
diff --git a/src/java/davmail/exchange/ews/UpdateItemMethod.java b/src/java/davmail/exchange/ews/UpdateItemMethod.java
index 16dfbcd7..38f5e996 100644
--- a/src/java/davmail/exchange/ews/UpdateItemMethod.java
+++ b/src/java/davmail/exchange/ews/UpdateItemMethod.java
@@ -21,9 +21,19 @@ package davmail.exchange.ews;
 import java.util.Set;
 
 /**
- * Uµpdate Item method.
+ * Update Item method.
  */
 public class UpdateItemMethod extends EWSMethod {
+    /**
+     * Update exchange item.
+     *
+     * @param messageDisposition save or send option
+     * @param conflictResolution overwrite option
+     * @param sendMeetingInvitationsOrCancellations
+     *                           send invitations option
+     * @param itemId             item id with change key
+     * @param updates            field updates
+     */
     public UpdateItemMethod(MessageDisposition messageDisposition, ConflictResolution conflictResolution,
                             SendMeetingInvitationsOrCancellations sendMeetingInvitationsOrCancellations,
                             ItemId itemId, Set<FieldUpdate> updates) {