230 files changed, 21 insertions, 34 deletions

diff --git a/Android.mk b/Android.mk
index e9c5da2d1..1a84cf53b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,6 +43,27 @@ include $(BUILD_PACKAGE)
 
 # only include rules to build other stuff for the original package, not derived package.
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
+
+# Build the com.android.emailcommon static library. At the moment, this includes
+# the emailcommon files themselves plus everything under src/org (apache code).  All of our
+# AIDL files are also compiled into the static library
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := com.android.emailcommon
+LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
+LOCAL_SRC_FILES += $(call all-java-files-under, src/org)
+LOCAL_SRC_FILES += \
+    src/com/android/emailcommon/service/IEmailService.aidl \
+    src/com/android/emailcommon/service/IEmailServiceCallback.aidl \
+    src/com/android/emailcommon/service/IPolicyService.aidl \
+    src/com/android/emailcommon/service/IAccountService.aidl
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
 # additionally, build unit tests in a separate .apk
 include $(call all-makefiles-under,$(LOCAL_PATH))
+
 endif
diff --git a/emailcommon/Android.mk b/emailcommon/Android.mk
deleted file mode 100644
index 5173b8d0e..000000000
--- a/emailcommon/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2011, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-# Build the com.android.emailcommon static library. At the moment, this includes
-# the emailcommon files themselves plus everything under src/org (apache code).  All of our
-# AIDL files are also compiled into the static library
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := com.android.emailcommon
-LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
-LOCAL_SRC_FILES += $(call all-java-files-under, src/org)
-LOCAL_SRC_FILES += \
-    src/com/android/emailcommon/service/IEmailServiceCallback.aidl \
-    src/com/android/emailcommon/service/IEmailService.aidl \
-    src/com/android/emailcommon/service/IPolicyService.aidl \
-    src/com/android/emailcommon/service/IAccountService.aidl
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/emailcommon/src/com/android/emailcommon/AccountManagerTypes.java b/src/com/android/emailcommon/AccountManagerTypes.java
index 4ccd480a5..4ccd480a5 100644
--- a/emailcommon/src/com/android/emailcommon/AccountManagerTypes.java
+++ b/src/com/android/emailcommon/AccountManagerTypes.java
diff --git a/emailcommon/src/com/android/emailcommon/Api.java b/src/com/android/emailcommon/Api.java
index ed284d7fb..ed284d7fb 100644
--- a/emailcommon/src/com/android/emailcommon/Api.java
+++ b/src/com/android/emailcommon/Api.java
diff --git a/emailcommon/src/com/android/emailcommon/CalendarProviderStub.java b/src/com/android/emailcommon/CalendarProviderStub.java
index eac371ada..eac371ada 100644
--- a/emailcommon/src/com/android/emailcommon/CalendarProviderStub.java
+++ b/src/com/android/emailcommon/CalendarProviderStub.java
diff --git a/emailcommon/src/com/android/emailcommon/Configuration.java b/src/com/android/emailcommon/Configuration.java
index d9469d906..d9469d906 100644
--- a/emailcommon/src/com/android/emailcommon/Configuration.java
+++ b/src/com/android/emailcommon/Configuration.java
diff --git a/emailcommon/src/com/android/emailcommon/Device.java b/src/com/android/emailcommon/Device.java
index a93a17a2e..a93a17a2e 100644
--- a/emailcommon/src/com/android/emailcommon/Device.java
+++ b/src/com/android/emailcommon/Device.java
diff --git a/emailcommon/src/com/android/emailcommon/Logging.java b/src/com/android/emailcommon/Logging.java
index f9bf7b755..f9bf7b755 100644
--- a/emailcommon/src/com/android/emailcommon/Logging.java
+++ b/src/com/android/emailcommon/Logging.java
diff --git a/emailcommon/src/com/android/emailcommon/TempDirectory.java b/src/com/android/emailcommon/TempDirectory.java
index 252488c9f..252488c9f 100644
--- a/emailcommon/src/com/android/emailcommon/TempDirectory.java
+++ b/src/com/android/emailcommon/TempDirectory.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/BinaryTempFileBody.java b/src/com/android/emailcommon/internet/BinaryTempFileBody.java
index f0821edd4..f0821edd4 100644
--- a/emailcommon/src/com/android/emailcommon/internet/BinaryTempFileBody.java
+++ b/src/com/android/emailcommon/internet/BinaryTempFileBody.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/MimeBodyPart.java b/src/com/android/emailcommon/internet/MimeBodyPart.java
index 01efd554f..01efd554f 100644
--- a/emailcommon/src/com/android/emailcommon/internet/MimeBodyPart.java
+++ b/src/com/android/emailcommon/internet/MimeBodyPart.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/MimeHeader.java b/src/com/android/emailcommon/internet/MimeHeader.java
index b0ad7772e..b0ad7772e 100644
--- a/emailcommon/src/com/android/emailcommon/internet/MimeHeader.java
+++ b/src/com/android/emailcommon/internet/MimeHeader.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/MimeMessage.java b/src/com/android/emailcommon/internet/MimeMessage.java
index 412092da4..412092da4 100644
--- a/emailcommon/src/com/android/emailcommon/internet/MimeMessage.java
+++ b/src/com/android/emailcommon/internet/MimeMessage.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/MimeMultipart.java b/src/com/android/emailcommon/internet/MimeMultipart.java
index e6977ee4f..e6977ee4f 100644
--- a/emailcommon/src/com/android/emailcommon/internet/MimeMultipart.java
+++ b/src/com/android/emailcommon/internet/MimeMultipart.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/MimeUtility.java b/src/com/android/emailcommon/internet/MimeUtility.java
index 69330d76b..69330d76b 100644
--- a/emailcommon/src/com/android/emailcommon/internet/MimeUtility.java
+++ b/src/com/android/emailcommon/internet/MimeUtility.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java b/src/com/android/emailcommon/internet/Rfc822Output.java
index 7382d30b2..7382d30b2 100644
--- a/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
+++ b/src/com/android/emailcommon/internet/Rfc822Output.java
diff --git a/emailcommon/src/com/android/emailcommon/internet/TextBody.java b/src/com/android/emailcommon/internet/TextBody.java
index 09c265c8e..09c265c8e 100644
--- a/emailcommon/src/com/android/emailcommon/internet/TextBody.java
+++ b/src/com/android/emailcommon/internet/TextBody.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Address.java b/src/com/android/emailcommon/mail/Address.java
index 76a3b7c6f..76a3b7c6f 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Address.java
+++ b/src/com/android/emailcommon/mail/Address.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/AuthenticationFailedException.java b/src/com/android/emailcommon/mail/AuthenticationFailedException.java
index af8d96c09..af8d96c09 100644
--- a/emailcommon/src/com/android/emailcommon/mail/AuthenticationFailedException.java
+++ b/src/com/android/emailcommon/mail/AuthenticationFailedException.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Body.java b/src/com/android/emailcommon/mail/Body.java
index 841ab42a7..841ab42a7 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Body.java
+++ b/src/com/android/emailcommon/mail/Body.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/BodyPart.java b/src/com/android/emailcommon/mail/BodyPart.java
index f698a139d..f698a139d 100644
--- a/emailcommon/src/com/android/emailcommon/mail/BodyPart.java
+++ b/src/com/android/emailcommon/mail/BodyPart.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/CertificateValidationException.java b/src/com/android/emailcommon/mail/CertificateValidationException.java
index 83c6224df..83c6224df 100644
--- a/emailcommon/src/com/android/emailcommon/mail/CertificateValidationException.java
+++ b/src/com/android/emailcommon/mail/CertificateValidationException.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/FetchProfile.java b/src/com/android/emailcommon/mail/FetchProfile.java
index bfa48d30f..bfa48d30f 100644
--- a/emailcommon/src/com/android/emailcommon/mail/FetchProfile.java
+++ b/src/com/android/emailcommon/mail/FetchProfile.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Fetchable.java b/src/com/android/emailcommon/mail/Fetchable.java
index 4314f93f5..4314f93f5 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Fetchable.java
+++ b/src/com/android/emailcommon/mail/Fetchable.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Flag.java b/src/com/android/emailcommon/mail/Flag.java
index bcdcb8b7e..bcdcb8b7e 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Flag.java
+++ b/src/com/android/emailcommon/mail/Flag.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Folder.java b/src/com/android/emailcommon/mail/Folder.java
index ea7fc5984..ea7fc5984 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Folder.java
+++ b/src/com/android/emailcommon/mail/Folder.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/MeetingInfo.java b/src/com/android/emailcommon/mail/MeetingInfo.java
index 1489a5597..1489a5597 100644
--- a/emailcommon/src/com/android/emailcommon/mail/MeetingInfo.java
+++ b/src/com/android/emailcommon/mail/MeetingInfo.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Message.java b/src/com/android/emailcommon/mail/Message.java
index 09aef87d1..09aef87d1 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Message.java
+++ b/src/com/android/emailcommon/mail/Message.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/MessageDateComparator.java b/src/com/android/emailcommon/mail/MessageDateComparator.java
index 0b1a55115..0b1a55115 100644
--- a/emailcommon/src/com/android/emailcommon/mail/MessageDateComparator.java
+++ b/src/com/android/emailcommon/mail/MessageDateComparator.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/MessagingException.java b/src/com/android/emailcommon/mail/MessagingException.java
index ba3cf2383..ba3cf2383 100644
--- a/emailcommon/src/com/android/emailcommon/mail/MessagingException.java
+++ b/src/com/android/emailcommon/mail/MessagingException.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Multipart.java b/src/com/android/emailcommon/mail/Multipart.java
index 4a1a06714..4a1a06714 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Multipart.java
+++ b/src/com/android/emailcommon/mail/Multipart.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/PackedString.java b/src/com/android/emailcommon/mail/PackedString.java
index de5fe4692..de5fe4692 100644
--- a/emailcommon/src/com/android/emailcommon/mail/PackedString.java
+++ b/src/com/android/emailcommon/mail/PackedString.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Part.java b/src/com/android/emailcommon/mail/Part.java
index eeb233ca9..eeb233ca9 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Part.java
+++ b/src/com/android/emailcommon/mail/Part.java
diff --git a/emailcommon/src/com/android/emailcommon/mail/Snippet.java b/src/com/android/emailcommon/mail/Snippet.java
index 38f982e5d..38f982e5d 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Snippet.java
+++ b/src/com/android/emailcommon/mail/Snippet.java
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.aidl b/src/com/android/emailcommon/provider/EmailContent.aidl
index 7505fa6f9..7505fa6f9 100644
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.aidl
+++ b/src/com/android/emailcommon/provider/EmailContent.aidl
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/src/com/android/emailcommon/provider/EmailContent.java
index f17390e56..f17390e56 100644
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/src/com/android/emailcommon/provider/EmailContent.java
diff --git a/emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java b/src/com/android/emailcommon/service/AccountServiceProxy.java
index 55e381908..55e381908 100644
--- a/emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java
+++ b/src/com/android/emailcommon/service/AccountServiceProxy.java
diff --git a/emailcommon/src/com/android/emailcommon/service/EmailServiceConstants.java b/src/com/android/emailcommon/service/EmailServiceConstants.java
index b229ffc64..b229ffc64 100644
--- a/emailcommon/src/com/android/emailcommon/service/EmailServiceConstants.java
+++ b/src/com/android/emailcommon/service/EmailServiceConstants.java
diff --git a/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java b/src/com/android/emailcommon/service/EmailServiceProxy.java
index ebe3b68a4..ebe3b68a4 100644
--- a/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
+++ b/src/com/android/emailcommon/service/EmailServiceProxy.java
diff --git a/emailcommon/src/com/android/emailcommon/service/EmailServiceStatus.java b/src/com/android/emailcommon/service/EmailServiceStatus.java
index 055f79a33..055f79a33 100644
--- a/emailcommon/src/com/android/emailcommon/service/EmailServiceStatus.java
+++ b/src/com/android/emailcommon/service/EmailServiceStatus.java
diff --git a/emailcommon/src/com/android/emailcommon/service/IAccountService.aidl b/src/com/android/emailcommon/service/IAccountService.aidl
index ea945c04e..ea945c04e 100644
--- a/emailcommon/src/com/android/emailcommon/service/IAccountService.aidl
+++ b/src/com/android/emailcommon/service/IAccountService.aidl
diff --git a/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl b/src/com/android/emailcommon/service/IEmailService.aidl
index 75f10cf6b..75f10cf6b 100644
--- a/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
+++ b/src/com/android/emailcommon/service/IEmailService.aidl
diff --git a/emailcommon/src/com/android/emailcommon/service/IEmailServiceCallback.aidl b/src/com/android/emailcommon/service/IEmailServiceCallback.aidl
index e4c6093fc..e4c6093fc 100644
--- a/emailcommon/src/com/android/emailcommon/service/IEmailServiceCallback.aidl
+++ b/src/com/android/emailcommon/service/IEmailServiceCallback.aidl
diff --git a/emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl b/src/com/android/emailcommon/service/IPolicyService.aidl
index 646abf353..646abf353 100644
--- a/emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl
+++ b/src/com/android/emailcommon/service/IPolicyService.aidl
diff --git a/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java b/src/com/android/emailcommon/service/PolicyServiceProxy.java
index 0be702a31..0be702a31 100644
--- a/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
+++ b/src/com/android/emailcommon/service/PolicyServiceProxy.java
diff --git a/emailcommon/src/com/android/emailcommon/service/PolicySet.aidl b/src/com/android/emailcommon/service/PolicySet.aidl
index e825c62c3..e825c62c3 100644
--- a/emailcommon/src/com/android/emailcommon/service/PolicySet.aidl
+++ b/src/com/android/emailcommon/service/PolicySet.aidl
diff --git a/emailcommon/src/com/android/emailcommon/service/PolicySet.java b/src/com/android/emailcommon/service/PolicySet.java
index 8b983e94e..8b983e94e 100644
--- a/emailcommon/src/com/android/emailcommon/service/PolicySet.java
+++ b/src/com/android/emailcommon/service/PolicySet.java
diff --git a/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java b/src/com/android/emailcommon/service/ServiceProxy.java
index 4e80c6980..4e80c6980 100644
--- a/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
+++ b/src/com/android/emailcommon/service/ServiceProxy.java
diff --git a/emailcommon/src/com/android/emailcommon/service/SyncWindow.java b/src/com/android/emailcommon/service/SyncWindow.java
index b81834fea..b81834fea 100644
--- a/emailcommon/src/com/android/emailcommon/service/SyncWindow.java
+++ b/src/com/android/emailcommon/service/SyncWindow.java
diff --git a/emailcommon/src/com/android/emailcommon/utility/AccountReconciler.java b/src/com/android/emailcommon/utility/AccountReconciler.java
index 6958d205c..6958d205c 100644
--- a/emailcommon/src/com/android/emailcommon/utility/AccountReconciler.java
+++ b/src/com/android/emailcommon/utility/AccountReconciler.java
diff --git a/emailcommon/src/com/android/emailcommon/utility/AttachmentUtilities.java b/src/com/android/emailcommon/utility/AttachmentUtilities.java
index 12954c667..12954c667 100644
--- a/emailcommon/src/com/android/emailcommon/utility/AttachmentUtilities.java
+++ b/src/com/android/emailcommon/utility/AttachmentUtilities.java
diff --git a/emailcommon/src/com/android/emailcommon/utility/ConversionUtilities.java b/src/com/android/emailcommon/utility/ConversionUtilities.java
index dca31d647..dca31d647 100644
--- a/emailcommon/src/com/android/emailcommon/utility/ConversionUtilities.java
+++ b/src/com/android/emailcommon/utility/ConversionUtilities.java
diff --git a/emailcommon/src/com/android/emailcommon/utility/LoggingInputStream.java b/src/com/android/emailcommon/utility/LoggingInputStream.java
index 212efa183..212efa183 100644
--- a/emailcommon/src/com/android/emailcommon/utility/LoggingInputStream.java
+++ b/src/com/android/emailcommon/utility/LoggingInputStream.java
diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java b/src/com/android/emailcommon/utility/SSLUtils.java
index 4869a0f6a..4869a0f6a 100644
--- a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
+++ b/src/com/android/emailcommon/utility/SSLUtils.java
diff --git a/emailcommon/src/com/android/emailcommon/utility/Utility.java b/src/com/android/emailcommon/utility/Utility.java
index f3dc599c2..f3dc599c2 100644
--- a/emailcommon/src/com/android/emailcommon/utility/Utility.java
+++ b/src/com/android/emailcommon/utility/Utility.java
diff --git a/emailcommon/src/org/apache/commons/io/CopyUtils.java b/src/org/apache/commons/io/CopyUtils.java
index eab8307e7..eab8307e7 100644
--- a/emailcommon/src/org/apache/commons/io/CopyUtils.java
+++ b/src/org/apache/commons/io/CopyUtils.java
diff --git a/emailcommon/src/org/apache/commons/io/DirectoryWalker.java b/src/org/apache/commons/io/DirectoryWalker.java
index 9e564ae86..9e564ae86 100644
--- a/emailcommon/src/org/apache/commons/io/DirectoryWalker.java
+++ b/src/org/apache/commons/io/DirectoryWalker.java
diff --git a/emailcommon/src/org/apache/commons/io/EndianUtils.java b/src/org/apache/commons/io/EndianUtils.java
index 810feac04..810feac04 100644
--- a/emailcommon/src/org/apache/commons/io/EndianUtils.java
+++ b/src/org/apache/commons/io/EndianUtils.java
diff --git a/emailcommon/src/org/apache/commons/io/FileCleaner.java b/src/org/apache/commons/io/FileCleaner.java
index 59c2f4109..59c2f4109 100644
--- a/emailcommon/src/org/apache/commons/io/FileCleaner.java
+++ b/src/org/apache/commons/io/FileCleaner.java
diff --git a/emailcommon/src/org/apache/commons/io/FileCleaningTracker.java b/src/org/apache/commons/io/FileCleaningTracker.java
index 4074e6a76..4074e6a76 100644
--- a/emailcommon/src/org/apache/commons/io/FileCleaningTracker.java
+++ b/src/org/apache/commons/io/FileCleaningTracker.java
diff --git a/emailcommon/src/org/apache/commons/io/FileDeleteStrategy.java b/src/org/apache/commons/io/FileDeleteStrategy.java
index 8b6b4b9aa..8b6b4b9aa 100644
--- a/emailcommon/src/org/apache/commons/io/FileDeleteStrategy.java
+++ b/src/org/apache/commons/io/FileDeleteStrategy.java
diff --git a/emailcommon/src/org/apache/commons/io/FileSystemUtils.java b/src/org/apache/commons/io/FileSystemUtils.java
index 1765976c4..1765976c4 100644
--- a/emailcommon/src/org/apache/commons/io/FileSystemUtils.java
+++ b/src/org/apache/commons/io/FileSystemUtils.java
diff --git a/emailcommon/src/org/apache/commons/io/FileUtils.java b/src/org/apache/commons/io/FileUtils.java
index d5de771c7..d5de771c7 100644
--- a/emailcommon/src/org/apache/commons/io/FileUtils.java
+++ b/src/org/apache/commons/io/FileUtils.java
diff --git a/emailcommon/src/org/apache/commons/io/FilenameUtils.java b/src/org/apache/commons/io/FilenameUtils.java
index d8cc78b24..d8cc78b24 100644
--- a/emailcommon/src/org/apache/commons/io/FilenameUtils.java
+++ b/src/org/apache/commons/io/FilenameUtils.java
diff --git a/emailcommon/src/org/apache/commons/io/HexDump.java b/src/org/apache/commons/io/HexDump.java
index b0d468d18..b0d468d18 100644
--- a/emailcommon/src/org/apache/commons/io/HexDump.java
+++ b/src/org/apache/commons/io/HexDump.java
diff --git a/emailcommon/src/org/apache/commons/io/IOCase.java b/src/org/apache/commons/io/IOCase.java
index 4230f450d..4230f450d 100644
--- a/emailcommon/src/org/apache/commons/io/IOCase.java
+++ b/src/org/apache/commons/io/IOCase.java
diff --git a/emailcommon/src/org/apache/commons/io/IOExceptionWithCause.java b/src/org/apache/commons/io/IOExceptionWithCause.java
index a15815a22..a15815a22 100644
--- a/emailcommon/src/org/apache/commons/io/IOExceptionWithCause.java
+++ b/src/org/apache/commons/io/IOExceptionWithCause.java
diff --git a/emailcommon/src/org/apache/commons/io/IOUtils.java b/src/org/apache/commons/io/IOUtils.java
index 3f6c65c13..3f6c65c13 100644
--- a/emailcommon/src/org/apache/commons/io/IOUtils.java
+++ b/src/org/apache/commons/io/IOUtils.java
diff --git a/emailcommon/src/org/apache/commons/io/LineIterator.java b/src/org/apache/commons/io/LineIterator.java
index eac47d23a..eac47d23a 100644
--- a/emailcommon/src/org/apache/commons/io/LineIterator.java
+++ b/src/org/apache/commons/io/LineIterator.java
diff --git a/emailcommon/src/org/apache/commons/io/ThirdPartyProject.prop b/src/org/apache/commons/io/ThirdPartyProject.prop
index b09d3900c..b09d3900c 100644
--- a/emailcommon/src/org/apache/commons/io/ThirdPartyProject.prop
+++ b/src/org/apache/commons/io/ThirdPartyProject.prop
diff --git a/emailcommon/src/org/apache/commons/io/comparator/DefaultFileComparator.java b/src/org/apache/commons/io/comparator/DefaultFileComparator.java
index 8de3cc4e7..8de3cc4e7 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/DefaultFileComparator.java
+++ b/src/org/apache/commons/io/comparator/DefaultFileComparator.java
diff --git a/emailcommon/src/org/apache/commons/io/comparator/ExtensionFileComparator.java b/src/org/apache/commons/io/comparator/ExtensionFileComparator.java
index 5797b02eb..5797b02eb 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/ExtensionFileComparator.java
+++ b/src/org/apache/commons/io/comparator/ExtensionFileComparator.java
diff --git a/emailcommon/src/org/apache/commons/io/comparator/LastModifiedFileComparator.java b/src/org/apache/commons/io/comparator/LastModifiedFileComparator.java
index 0dcd0b242..0dcd0b242 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/LastModifiedFileComparator.java
+++ b/src/org/apache/commons/io/comparator/LastModifiedFileComparator.java
diff --git a/emailcommon/src/org/apache/commons/io/comparator/NameFileComparator.java b/src/org/apache/commons/io/comparator/NameFileComparator.java
index eb64fb589..eb64fb589 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/NameFileComparator.java
+++ b/src/org/apache/commons/io/comparator/NameFileComparator.java
diff --git a/emailcommon/src/org/apache/commons/io/comparator/PathFileComparator.java b/src/org/apache/commons/io/comparator/PathFileComparator.java
index e93113825..e93113825 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/PathFileComparator.java
+++ b/src/org/apache/commons/io/comparator/PathFileComparator.java
diff --git a/emailcommon/src/org/apache/commons/io/comparator/ReverseComparator.java b/src/org/apache/commons/io/comparator/ReverseComparator.java
index ab0b38caa..ab0b38caa 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/ReverseComparator.java
+++ b/src/org/apache/commons/io/comparator/ReverseComparator.java
diff --git a/emailcommon/src/org/apache/commons/io/comparator/SizeFileComparator.java b/src/org/apache/commons/io/comparator/SizeFileComparator.java
index 609c159c9..609c159c9 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/SizeFileComparator.java
+++ b/src/org/apache/commons/io/comparator/SizeFileComparator.java
diff --git a/emailcommon/src/org/apache/commons/io/comparator/package.html b/src/org/apache/commons/io/comparator/package.html
index a2f756f18..a2f756f18 100644
--- a/emailcommon/src/org/apache/commons/io/comparator/package.html
+++ b/src/org/apache/commons/io/comparator/package.html
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/AbstractFileFilter.java b/src/org/apache/commons/io/filefilter/AbstractFileFilter.java
index 9e188f82e..9e188f82e 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/AbstractFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/AbstractFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/AgeFileFilter.java b/src/org/apache/commons/io/filefilter/AgeFileFilter.java
index ab73cb840..ab73cb840 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/AgeFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/AgeFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/AndFileFilter.java b/src/org/apache/commons/io/filefilter/AndFileFilter.java
index 9f3bb06ae..9f3bb06ae 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/AndFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/AndFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/CanReadFileFilter.java b/src/org/apache/commons/io/filefilter/CanReadFileFilter.java
index a9c132570..a9c132570 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/CanReadFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/CanReadFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/CanWriteFileFilter.java b/src/org/apache/commons/io/filefilter/CanWriteFileFilter.java
index da664f25c..da664f25c 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/CanWriteFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/CanWriteFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/ConditionalFileFilter.java b/src/org/apache/commons/io/filefilter/ConditionalFileFilter.java
index b1c481368..b1c481368 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/ConditionalFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/ConditionalFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/DelegateFileFilter.java b/src/org/apache/commons/io/filefilter/DelegateFileFilter.java
index c2d67c469..c2d67c469 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/DelegateFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/DelegateFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/DirectoryFileFilter.java b/src/org/apache/commons/io/filefilter/DirectoryFileFilter.java
index 3412e7bef..3412e7bef 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/DirectoryFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/DirectoryFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/EmptyFileFilter.java b/src/org/apache/commons/io/filefilter/EmptyFileFilter.java
index e88a862d4..e88a862d4 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/EmptyFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/EmptyFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/FalseFileFilter.java b/src/org/apache/commons/io/filefilter/FalseFileFilter.java
index 8a87d4092..8a87d4092 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/FalseFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/FalseFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/FileFileFilter.java b/src/org/apache/commons/io/filefilter/FileFileFilter.java
index 0d49eddd4..0d49eddd4 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/FileFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/FileFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/FileFilterUtils.java b/src/org/apache/commons/io/filefilter/FileFilterUtils.java
index 71c37b1d2..71c37b1d2 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/FileFilterUtils.java
+++ b/src/org/apache/commons/io/filefilter/FileFilterUtils.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/HiddenFileFilter.java b/src/org/apache/commons/io/filefilter/HiddenFileFilter.java
index 244153d5e..244153d5e 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/HiddenFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/HiddenFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/IOFileFilter.java b/src/org/apache/commons/io/filefilter/IOFileFilter.java
index 5ebd82751..5ebd82751 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/IOFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/IOFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/NameFileFilter.java b/src/org/apache/commons/io/filefilter/NameFileFilter.java
index 19fe380e1..19fe380e1 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/NameFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/NameFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/NotFileFilter.java b/src/org/apache/commons/io/filefilter/NotFileFilter.java
index 710c8ecf3..710c8ecf3 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/NotFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/NotFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/OrFileFilter.java b/src/org/apache/commons/io/filefilter/OrFileFilter.java
index 520eefa4f..520eefa4f 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/OrFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/OrFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/PrefixFileFilter.java b/src/org/apache/commons/io/filefilter/PrefixFileFilter.java
index 8c6b737fb..8c6b737fb 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/PrefixFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/PrefixFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/RegexFileFilter.java b/src/org/apache/commons/io/filefilter/RegexFileFilter.java
index b49a1bd3b..b49a1bd3b 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/RegexFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/RegexFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/SizeFileFilter.java b/src/org/apache/commons/io/filefilter/SizeFileFilter.java
index 614e4243f..614e4243f 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/SizeFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/SizeFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/SuffixFileFilter.java b/src/org/apache/commons/io/filefilter/SuffixFileFilter.java
index 8bdf781a4..8bdf781a4 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/SuffixFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/SuffixFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/TrueFileFilter.java b/src/org/apache/commons/io/filefilter/TrueFileFilter.java
index be1b13a7e..be1b13a7e 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/TrueFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/TrueFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/WildcardFileFilter.java b/src/org/apache/commons/io/filefilter/WildcardFileFilter.java
index f3a1ee930..f3a1ee930 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/WildcardFileFilter.java
+++ b/src/org/apache/commons/io/filefilter/WildcardFileFilter.java
diff --git a/emailcommon/src/org/apache/commons/io/filefilter/package.html b/src/org/apache/commons/io/filefilter/package.html
index 7a45f251d..7a45f251d 100644
--- a/emailcommon/src/org/apache/commons/io/filefilter/package.html
+++ b/src/org/apache/commons/io/filefilter/package.html
diff --git a/emailcommon/src/org/apache/commons/io/input/AutoCloseInputStream.java b/src/org/apache/commons/io/input/AutoCloseInputStream.java
index bb62358f7..bb62358f7 100644
--- a/emailcommon/src/org/apache/commons/io/input/AutoCloseInputStream.java
+++ b/src/org/apache/commons/io/input/AutoCloseInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/CharSequenceReader.java b/src/org/apache/commons/io/input/CharSequenceReader.java
index 6ee11d87d..6ee11d87d 100644
--- a/emailcommon/src/org/apache/commons/io/input/CharSequenceReader.java
+++ b/src/org/apache/commons/io/input/CharSequenceReader.java
diff --git a/emailcommon/src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java b/src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
index 13d048946..13d048946 100644
--- a/emailcommon/src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
+++ b/src/org/apache/commons/io/input/ClassLoaderObjectInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/CloseShieldInputStream.java b/src/org/apache/commons/io/input/CloseShieldInputStream.java
index 2058beeb2..2058beeb2 100644
--- a/emailcommon/src/org/apache/commons/io/input/CloseShieldInputStream.java
+++ b/src/org/apache/commons/io/input/CloseShieldInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/ClosedInputStream.java b/src/org/apache/commons/io/input/ClosedInputStream.java
index 86c83c903..86c83c903 100644
--- a/emailcommon/src/org/apache/commons/io/input/ClosedInputStream.java
+++ b/src/org/apache/commons/io/input/ClosedInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/CountingInputStream.java b/src/org/apache/commons/io/input/CountingInputStream.java
index 2782276c8..2782276c8 100644
--- a/emailcommon/src/org/apache/commons/io/input/CountingInputStream.java
+++ b/src/org/apache/commons/io/input/CountingInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/DemuxInputStream.java b/src/org/apache/commons/io/input/DemuxInputStream.java
index 64b41c4d4..64b41c4d4 100644
--- a/emailcommon/src/org/apache/commons/io/input/DemuxInputStream.java
+++ b/src/org/apache/commons/io/input/DemuxInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/NullInputStream.java b/src/org/apache/commons/io/input/NullInputStream.java
index 7cee2c6d0..7cee2c6d0 100644
--- a/emailcommon/src/org/apache/commons/io/input/NullInputStream.java
+++ b/src/org/apache/commons/io/input/NullInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/NullReader.java b/src/org/apache/commons/io/input/NullReader.java
index 159e39021..159e39021 100644
--- a/emailcommon/src/org/apache/commons/io/input/NullReader.java
+++ b/src/org/apache/commons/io/input/NullReader.java
diff --git a/emailcommon/src/org/apache/commons/io/input/ProxyInputStream.java b/src/org/apache/commons/io/input/ProxyInputStream.java
index a08ad92d0..a08ad92d0 100644
--- a/emailcommon/src/org/apache/commons/io/input/ProxyInputStream.java
+++ b/src/org/apache/commons/io/input/ProxyInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/ProxyReader.java b/src/org/apache/commons/io/input/ProxyReader.java
index d55290f5a..d55290f5a 100644
--- a/emailcommon/src/org/apache/commons/io/input/ProxyReader.java
+++ b/src/org/apache/commons/io/input/ProxyReader.java
diff --git a/emailcommon/src/org/apache/commons/io/input/SwappedDataInputStream.java b/src/org/apache/commons/io/input/SwappedDataInputStream.java
index 5b65b1eee..5b65b1eee 100644
--- a/emailcommon/src/org/apache/commons/io/input/SwappedDataInputStream.java
+++ b/src/org/apache/commons/io/input/SwappedDataInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/TeeInputStream.java b/src/org/apache/commons/io/input/TeeInputStream.java
index fed000ed6..fed000ed6 100644
--- a/emailcommon/src/org/apache/commons/io/input/TeeInputStream.java
+++ b/src/org/apache/commons/io/input/TeeInputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/input/package.html b/src/org/apache/commons/io/input/package.html
index 9aa8b15ba..9aa8b15ba 100644
--- a/emailcommon/src/org/apache/commons/io/input/package.html
+++ b/src/org/apache/commons/io/input/package.html
diff --git a/emailcommon/src/org/apache/commons/io/output/ByteArrayOutputStream.java b/src/org/apache/commons/io/output/ByteArrayOutputStream.java
index 906a41dd4..906a41dd4 100644
--- a/emailcommon/src/org/apache/commons/io/output/ByteArrayOutputStream.java
+++ b/src/org/apache/commons/io/output/ByteArrayOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/CloseShieldOutputStream.java b/src/org/apache/commons/io/output/CloseShieldOutputStream.java
index 63f44be40..63f44be40 100644
--- a/emailcommon/src/org/apache/commons/io/output/CloseShieldOutputStream.java
+++ b/src/org/apache/commons/io/output/CloseShieldOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/ClosedOutputStream.java b/src/org/apache/commons/io/output/ClosedOutputStream.java
index b585c0cf4..b585c0cf4 100644
--- a/emailcommon/src/org/apache/commons/io/output/ClosedOutputStream.java
+++ b/src/org/apache/commons/io/output/ClosedOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/CountingOutputStream.java b/src/org/apache/commons/io/output/CountingOutputStream.java
index 672882860..672882860 100644
--- a/emailcommon/src/org/apache/commons/io/output/CountingOutputStream.java
+++ b/src/org/apache/commons/io/output/CountingOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/DeferredFileOutputStream.java b/src/org/apache/commons/io/output/DeferredFileOutputStream.java
index b8a9e9607..b8a9e9607 100644
--- a/emailcommon/src/org/apache/commons/io/output/DeferredFileOutputStream.java
+++ b/src/org/apache/commons/io/output/DeferredFileOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/DemuxOutputStream.java b/src/org/apache/commons/io/output/DemuxOutputStream.java
index 280df14d3..280df14d3 100644
--- a/emailcommon/src/org/apache/commons/io/output/DemuxOutputStream.java
+++ b/src/org/apache/commons/io/output/DemuxOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/FileWriterWithEncoding.java b/src/org/apache/commons/io/output/FileWriterWithEncoding.java
index a8f89334b..a8f89334b 100644
--- a/emailcommon/src/org/apache/commons/io/output/FileWriterWithEncoding.java
+++ b/src/org/apache/commons/io/output/FileWriterWithEncoding.java
diff --git a/emailcommon/src/org/apache/commons/io/output/LockableFileWriter.java b/src/org/apache/commons/io/output/LockableFileWriter.java
index 6b10bd282..6b10bd282 100644
--- a/emailcommon/src/org/apache/commons/io/output/LockableFileWriter.java
+++ b/src/org/apache/commons/io/output/LockableFileWriter.java
diff --git a/emailcommon/src/org/apache/commons/io/output/NullOutputStream.java b/src/org/apache/commons/io/output/NullOutputStream.java
index 7e3cdaf2c..7e3cdaf2c 100644
--- a/emailcommon/src/org/apache/commons/io/output/NullOutputStream.java
+++ b/src/org/apache/commons/io/output/NullOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/NullWriter.java b/src/org/apache/commons/io/output/NullWriter.java
index aed52aba8..aed52aba8 100644
--- a/emailcommon/src/org/apache/commons/io/output/NullWriter.java
+++ b/src/org/apache/commons/io/output/NullWriter.java
diff --git a/emailcommon/src/org/apache/commons/io/output/ProxyOutputStream.java b/src/org/apache/commons/io/output/ProxyOutputStream.java
index b63d72317..b63d72317 100644
--- a/emailcommon/src/org/apache/commons/io/output/ProxyOutputStream.java
+++ b/src/org/apache/commons/io/output/ProxyOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/ProxyWriter.java b/src/org/apache/commons/io/output/ProxyWriter.java
index fbec62885..fbec62885 100644
--- a/emailcommon/src/org/apache/commons/io/output/ProxyWriter.java
+++ b/src/org/apache/commons/io/output/ProxyWriter.java
diff --git a/emailcommon/src/org/apache/commons/io/output/TeeOutputStream.java b/src/org/apache/commons/io/output/TeeOutputStream.java
index ee957fb3b..ee957fb3b 100644
--- a/emailcommon/src/org/apache/commons/io/output/TeeOutputStream.java
+++ b/src/org/apache/commons/io/output/TeeOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/ThresholdingOutputStream.java b/src/org/apache/commons/io/output/ThresholdingOutputStream.java
index fa69a804c..fa69a804c 100644
--- a/emailcommon/src/org/apache/commons/io/output/ThresholdingOutputStream.java
+++ b/src/org/apache/commons/io/output/ThresholdingOutputStream.java
diff --git a/emailcommon/src/org/apache/commons/io/output/package.html b/src/org/apache/commons/io/output/package.html
index db2cbce59..db2cbce59 100644
--- a/emailcommon/src/org/apache/commons/io/output/package.html
+++ b/src/org/apache/commons/io/output/package.html
diff --git a/emailcommon/src/org/apache/commons/io/overview.html b/src/org/apache/commons/io/overview.html
index 31311b5e9..31311b5e9 100644
--- a/emailcommon/src/org/apache/commons/io/overview.html
+++ b/src/org/apache/commons/io/overview.html
diff --git a/emailcommon/src/org/apache/commons/io/package.html b/src/org/apache/commons/io/package.html
index e5ba9b0aa..e5ba9b0aa 100644
--- a/emailcommon/src/org/apache/commons/io/package.html
+++ b/src/org/apache/commons/io/package.html
diff --git a/emailcommon/src/org/apache/james/mime4j/AbstractContentHandler.java b/src/org/apache/james/mime4j/AbstractContentHandler.java
index 06c9b90a0..06c9b90a0 100644
--- a/emailcommon/src/org/apache/james/mime4j/AbstractContentHandler.java
+++ b/src/org/apache/james/mime4j/AbstractContentHandler.java
diff --git a/emailcommon/src/org/apache/james/mime4j/BodyDescriptor.java b/src/org/apache/james/mime4j/BodyDescriptor.java
index 2fef0be04..2fef0be04 100644
--- a/emailcommon/src/org/apache/james/mime4j/BodyDescriptor.java
+++ b/src/org/apache/james/mime4j/BodyDescriptor.java
diff --git a/emailcommon/src/org/apache/james/mime4j/CloseShieldInputStream.java b/src/org/apache/james/mime4j/CloseShieldInputStream.java
index 94995d110..94995d110 100644
--- a/emailcommon/src/org/apache/james/mime4j/CloseShieldInputStream.java
+++ b/src/org/apache/james/mime4j/CloseShieldInputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/ContentHandler.java b/src/org/apache/james/mime4j/ContentHandler.java
index 946c89401..946c89401 100644
--- a/emailcommon/src/org/apache/james/mime4j/ContentHandler.java
+++ b/src/org/apache/james/mime4j/ContentHandler.java
diff --git a/emailcommon/src/org/apache/james/mime4j/EOLConvertingInputStream.java b/src/org/apache/james/mime4j/EOLConvertingInputStream.java
index 7d5009ca5..7d5009ca5 100644
--- a/emailcommon/src/org/apache/james/mime4j/EOLConvertingInputStream.java
+++ b/src/org/apache/james/mime4j/EOLConvertingInputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/Log.java b/src/org/apache/james/mime4j/Log.java
index e7f33fcc7..e7f33fcc7 100644
--- a/emailcommon/src/org/apache/james/mime4j/Log.java
+++ b/src/org/apache/james/mime4j/Log.java
diff --git a/emailcommon/src/org/apache/james/mime4j/LogFactory.java b/src/org/apache/james/mime4j/LogFactory.java
index c8f00d1d3..c8f00d1d3 100644
--- a/emailcommon/src/org/apache/james/mime4j/LogFactory.java
+++ b/src/org/apache/james/mime4j/LogFactory.java
diff --git a/emailcommon/src/org/apache/james/mime4j/MimeBoundaryInputStream.java b/src/org/apache/james/mime4j/MimeBoundaryInputStream.java
index 0fffb7820..0fffb7820 100644
--- a/emailcommon/src/org/apache/james/mime4j/MimeBoundaryInputStream.java
+++ b/src/org/apache/james/mime4j/MimeBoundaryInputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/MimeStreamParser.java b/src/org/apache/james/mime4j/MimeStreamParser.java
index e5fe97cdd..e5fe97cdd 100644
--- a/emailcommon/src/org/apache/james/mime4j/MimeStreamParser.java
+++ b/src/org/apache/james/mime4j/MimeStreamParser.java
diff --git a/emailcommon/src/org/apache/james/mime4j/RootInputStream.java b/src/org/apache/james/mime4j/RootInputStream.java
index fa848df18..fa848df18 100644
--- a/emailcommon/src/org/apache/james/mime4j/RootInputStream.java
+++ b/src/org/apache/james/mime4j/RootInputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/SimpleContentHandler.java b/src/org/apache/james/mime4j/SimpleContentHandler.java
index 13f1fd2c6..13f1fd2c6 100644
--- a/emailcommon/src/org/apache/james/mime4j/SimpleContentHandler.java
+++ b/src/org/apache/james/mime4j/SimpleContentHandler.java
diff --git a/emailcommon/src/org/apache/james/mime4j/ThirdPartyProject.prop b/src/org/apache/james/mime4j/ThirdPartyProject.prop
index 525791c21..525791c21 100644
--- a/emailcommon/src/org/apache/james/mime4j/ThirdPartyProject.prop
+++ b/src/org/apache/james/mime4j/ThirdPartyProject.prop
diff --git a/emailcommon/src/org/apache/james/mime4j/codec/EncoderUtil.java b/src/org/apache/james/mime4j/codec/EncoderUtil.java
index 6841bc998..6841bc998 100644
--- a/emailcommon/src/org/apache/james/mime4j/codec/EncoderUtil.java
+++ b/src/org/apache/james/mime4j/codec/EncoderUtil.java
diff --git a/emailcommon/src/org/apache/james/mime4j/decoder/Base64InputStream.java b/src/org/apache/james/mime4j/decoder/Base64InputStream.java
index 2461ed571..2461ed571 100644
--- a/emailcommon/src/org/apache/james/mime4j/decoder/Base64InputStream.java
+++ b/src/org/apache/james/mime4j/decoder/Base64InputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/decoder/ByteQueue.java b/src/org/apache/james/mime4j/decoder/ByteQueue.java
index 68e7d3380..68e7d3380 100644
--- a/emailcommon/src/org/apache/james/mime4j/decoder/ByteQueue.java
+++ b/src/org/apache/james/mime4j/decoder/ByteQueue.java
diff --git a/emailcommon/src/org/apache/james/mime4j/decoder/DecoderUtil.java b/src/org/apache/james/mime4j/decoder/DecoderUtil.java
index 551be0f57..551be0f57 100644
--- a/emailcommon/src/org/apache/james/mime4j/decoder/DecoderUtil.java
+++ b/src/org/apache/james/mime4j/decoder/DecoderUtil.java
diff --git a/emailcommon/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java b/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
index cbcb22628..cbcb22628 100644
--- a/emailcommon/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
+++ b/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java b/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
index dc32caf36..dc32caf36 100644
--- a/emailcommon/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
+++ b/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/AddressListField.java b/src/org/apache/james/mime4j/field/AddressListField.java
index b37abbb11..b37abbb11 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/AddressListField.java
+++ b/src/org/apache/james/mime4j/field/AddressListField.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java b/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
index eb6151377..eb6151377 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
+++ b/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/ContentTypeField.java b/src/org/apache/james/mime4j/field/ContentTypeField.java
index 646cf141a..646cf141a 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/ContentTypeField.java
+++ b/src/org/apache/james/mime4j/field/ContentTypeField.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/DateTimeField.java b/src/org/apache/james/mime4j/field/DateTimeField.java
index e65551fcd..e65551fcd 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/DateTimeField.java
+++ b/src/org/apache/james/mime4j/field/DateTimeField.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/DefaultFieldParser.java b/src/org/apache/james/mime4j/field/DefaultFieldParser.java
index 84fcdcb2d..84fcdcb2d 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/DefaultFieldParser.java
+++ b/src/org/apache/james/mime4j/field/DefaultFieldParser.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/DelegatingFieldParser.java b/src/org/apache/james/mime4j/field/DelegatingFieldParser.java
index 2a2866f57..2a2866f57 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/DelegatingFieldParser.java
+++ b/src/org/apache/james/mime4j/field/DelegatingFieldParser.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/Field.java b/src/org/apache/james/mime4j/field/Field.java
index 7c2a20dc8..7c2a20dc8 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/Field.java
+++ b/src/org/apache/james/mime4j/field/Field.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/FieldParser.java b/src/org/apache/james/mime4j/field/FieldParser.java
index 4f33c9e26..4f33c9e26 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/FieldParser.java
+++ b/src/org/apache/james/mime4j/field/FieldParser.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/MailboxField.java b/src/org/apache/james/mime4j/field/MailboxField.java
index 9404fd621..9404fd621 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/MailboxField.java
+++ b/src/org/apache/james/mime4j/field/MailboxField.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/MailboxListField.java b/src/org/apache/james/mime4j/field/MailboxListField.java
index 6364fc88c..6364fc88c 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/MailboxListField.java
+++ b/src/org/apache/james/mime4j/field/MailboxListField.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/UnstructuredField.java b/src/org/apache/james/mime4j/field/UnstructuredField.java
index 5e2adf9f2..5e2adf9f2 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/UnstructuredField.java
+++ b/src/org/apache/james/mime4j/field/UnstructuredField.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/Address.java b/src/org/apache/james/mime4j/field/address/Address.java
index 2a5d61e36..2a5d61e36 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/Address.java
+++ b/src/org/apache/james/mime4j/field/address/Address.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/AddressList.java b/src/org/apache/james/mime4j/field/address/AddressList.java
index fa4d02c23..fa4d02c23 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/AddressList.java
+++ b/src/org/apache/james/mime4j/field/address/AddressList.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/Builder.java b/src/org/apache/james/mime4j/field/address/Builder.java
index a2bd3f0c6..a2bd3f0c6 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/Builder.java
+++ b/src/org/apache/james/mime4j/field/address/Builder.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/DomainList.java b/src/org/apache/james/mime4j/field/address/DomainList.java
index df5b4de27..df5b4de27 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/DomainList.java
+++ b/src/org/apache/james/mime4j/field/address/DomainList.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/Group.java b/src/org/apache/james/mime4j/field/address/Group.java
index cca2b40b5..cca2b40b5 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/Group.java
+++ b/src/org/apache/james/mime4j/field/address/Group.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/Mailbox.java b/src/org/apache/james/mime4j/field/address/Mailbox.java
index c05a57f8e..c05a57f8e 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/Mailbox.java
+++ b/src/org/apache/james/mime4j/field/address/Mailbox.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/MailboxList.java b/src/org/apache/james/mime4j/field/address/MailboxList.java
index 25337de9e..25337de9e 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/MailboxList.java
+++ b/src/org/apache/james/mime4j/field/address/MailboxList.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/NamedMailbox.java b/src/org/apache/james/mime4j/field/address/NamedMailbox.java
index a54bd1dad..a54bd1dad 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/NamedMailbox.java
+++ b/src/org/apache/james/mime4j/field/address/NamedMailbox.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java b/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
index 4d56d000b..4d56d000b 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java b/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
index 47bdeda8e..47bdeda8e 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java b/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
index 737840e38..737840e38 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java b/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
index 8cb8f421f..8cb8f421f 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java b/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
index b52664386..b52664386 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java b/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
index f6017b9fc..f6017b9fc 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java b/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
index 5c244fa3e..5c244fa3e 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java b/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
index aeb469da1..aeb469da1 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java b/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
index 846c73167..846c73167 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java b/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
index 7d711c529..7d711c529 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTroute.java b/src/org/apache/james/mime4j/field/address/parser/ASTroute.java
index 54ea11523..54ea11523 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ASTroute.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTroute.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
index dde2a0892..dde2a0892 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
index 685988634..685988634 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
index a21ad35db..a21ad35db 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
index df8974a3b..df8974a3b 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
index 5987f19d8..5987f19d8 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
index 8ec2fe7d2..8ec2fe7d2 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/BaseNode.java b/src/org/apache/james/mime4j/field/address/parser/BaseNode.java
index 42fe3db0c..42fe3db0c 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/BaseNode.java
+++ b/src/org/apache/james/mime4j/field/address/parser/BaseNode.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java b/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
index 08b5c5bef..08b5c5bef 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
+++ b/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/Node.java b/src/org/apache/james/mime4j/field/address/parser/Node.java
index 158892016..158892016 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/Node.java
+++ b/src/org/apache/james/mime4j/field/address/parser/Node.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ParseException.java b/src/org/apache/james/mime4j/field/address/parser/ParseException.java
index 939c6cfed..939c6cfed 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/ParseException.java
+++ b/src/org/apache/james/mime4j/field/address/parser/ParseException.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java b/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
index 957bbeabc..957bbeabc 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
+++ b/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java b/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
index 9bf537e60..9bf537e60 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
+++ b/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/Token.java b/src/org/apache/james/mime4j/field/address/parser/Token.java
index 0228aac3e..0228aac3e 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/Token.java
+++ b/src/org/apache/james/mime4j/field/address/parser/Token.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java b/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
index c06a44cf3..c06a44cf3 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
+++ b/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
index 9d4a0f564..9d4a0f564 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
index 8a763287d..8a763287d 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
index 05d940db5..05d940db5 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java b/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
index 2c5dc8275..2c5dc8275 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java b/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
index c139e4f38..c139e4f38 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/Token.java b/src/org/apache/james/mime4j/field/contenttype/parser/Token.java
index 5bef6cf02..5bef6cf02 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/Token.java
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/Token.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java b/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
index 4a490efac..4a490efac 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/DateTime.java b/src/org/apache/james/mime4j/field/datetime/DateTime.java
index bf00ca753..bf00ca753 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/DateTime.java
+++ b/src/org/apache/james/mime4j/field/datetime/DateTime.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
index 04cb9520b..04cb9520b 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
+++ b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
index 17389d816..17389d816 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
+++ b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
index e75998cf2..e75998cf2 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
+++ b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java b/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
index 418699107..418699107 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
+++ b/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java b/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
index d44a9018b..d44a9018b 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
+++ b/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/Token.java b/src/org/apache/james/mime4j/field/datetime/parser/Token.java
index 52d101ed0..52d101ed0 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/Token.java
+++ b/src/org/apache/james/mime4j/field/datetime/parser/Token.java
diff --git a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java b/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
index 973255070..973255070 100644
--- a/emailcommon/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
+++ b/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/AbstractBody.java b/src/org/apache/james/mime4j/message/AbstractBody.java
index d2647ec77..d2647ec77 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/AbstractBody.java
+++ b/src/org/apache/james/mime4j/message/AbstractBody.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/BinaryBody.java b/src/org/apache/james/mime4j/message/BinaryBody.java
index bfc992a8f..bfc992a8f 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/BinaryBody.java
+++ b/src/org/apache/james/mime4j/message/BinaryBody.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/Body.java b/src/org/apache/james/mime4j/message/Body.java
index 54b8948db..54b8948db 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/Body.java
+++ b/src/org/apache/james/mime4j/message/Body.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/BodyPart.java b/src/org/apache/james/mime4j/message/BodyPart.java
index 474030d7f..474030d7f 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/BodyPart.java
+++ b/src/org/apache/james/mime4j/message/BodyPart.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/Entity.java b/src/org/apache/james/mime4j/message/Entity.java
index 96f2a4875..96f2a4875 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/Entity.java
+++ b/src/org/apache/james/mime4j/message/Entity.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/Header.java b/src/org/apache/james/mime4j/message/Header.java
index e9216a821..e9216a821 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/Header.java
+++ b/src/org/apache/james/mime4j/message/Header.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/MemoryBinaryBody.java b/src/org/apache/james/mime4j/message/MemoryBinaryBody.java
index a44db4db1..a44db4db1 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/MemoryBinaryBody.java
+++ b/src/org/apache/james/mime4j/message/MemoryBinaryBody.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/MemoryTextBody.java b/src/org/apache/james/mime4j/message/MemoryTextBody.java
index 71af6637c..71af6637c 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/MemoryTextBody.java
+++ b/src/org/apache/james/mime4j/message/MemoryTextBody.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/Message.java b/src/org/apache/james/mime4j/message/Message.java
index 514307185..514307185 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/Message.java
+++ b/src/org/apache/james/mime4j/message/Message.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/Multipart.java b/src/org/apache/james/mime4j/message/Multipart.java
index d83400097..d83400097 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/Multipart.java
+++ b/src/org/apache/james/mime4j/message/Multipart.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/TempFileBinaryBody.java b/src/org/apache/james/mime4j/message/TempFileBinaryBody.java
index 9db1482f4..9db1482f4 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/TempFileBinaryBody.java
+++ b/src/org/apache/james/mime4j/message/TempFileBinaryBody.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/TempFileTextBody.java b/src/org/apache/james/mime4j/message/TempFileTextBody.java
index b74e15d24..b74e15d24 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/TempFileTextBody.java
+++ b/src/org/apache/james/mime4j/message/TempFileTextBody.java
diff --git a/emailcommon/src/org/apache/james/mime4j/message/TextBody.java b/src/org/apache/james/mime4j/message/TextBody.java
index 4fe714466..4fe714466 100644
--- a/emailcommon/src/org/apache/james/mime4j/message/TextBody.java
+++ b/src/org/apache/james/mime4j/message/TextBody.java
diff --git a/emailcommon/src/org/apache/james/mime4j/util/CharsetUtil.java b/src/org/apache/james/mime4j/util/CharsetUtil.java
index 0fc267d3e..0fc267d3e 100644
--- a/emailcommon/src/org/apache/james/mime4j/util/CharsetUtil.java
+++ b/src/org/apache/james/mime4j/util/CharsetUtil.java
diff --git a/emailcommon/src/org/apache/james/mime4j/util/PartialInputStream.java b/src/org/apache/james/mime4j/util/PartialInputStream.java
index a5ac0596d..a5ac0596d 100644
--- a/emailcommon/src/org/apache/james/mime4j/util/PartialInputStream.java
+++ b/src/org/apache/james/mime4j/util/PartialInputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/util/PositionInputStream.java b/src/org/apache/james/mime4j/util/PositionInputStream.java
index 9fcd21d0c..9fcd21d0c 100644
--- a/emailcommon/src/org/apache/james/mime4j/util/PositionInputStream.java
+++ b/src/org/apache/james/mime4j/util/PositionInputStream.java
diff --git a/emailcommon/src/org/apache/james/mime4j/util/SimpleTempStorage.java b/src/org/apache/james/mime4j/util/SimpleTempStorage.java
index 930e4db02..930e4db02 100644
--- a/emailcommon/src/org/apache/james/mime4j/util/SimpleTempStorage.java
+++ b/src/org/apache/james/mime4j/util/SimpleTempStorage.java
diff --git a/emailcommon/src/org/apache/james/mime4j/util/TempFile.java b/src/org/apache/james/mime4j/util/TempFile.java
index f67e1e93e..f67e1e93e 100644
--- a/emailcommon/src/org/apache/james/mime4j/util/TempFile.java
+++ b/src/org/apache/james/mime4j/util/TempFile.java
diff --git a/emailcommon/src/org/apache/james/mime4j/util/TempPath.java b/src/org/apache/james/mime4j/util/TempPath.java
index 3b55aa6db..3b55aa6db 100644
--- a/emailcommon/src/org/apache/james/mime4j/util/TempPath.java
+++ b/src/org/apache/james/mime4j/util/TempPath.java
diff --git a/emailcommon/src/org/apache/james/mime4j/util/TempStorage.java b/src/org/apache/james/mime4j/util/TempStorage.java
index 4d3be4746..4d3be4746 100644
--- a/emailcommon/src/org/apache/james/mime4j/util/TempStorage.java
+++ b/src/org/apache/james/mime4j/util/TempStorage.java