4 files changed, 20 insertions, 12 deletions
diff --git a/src/messaging/maildirFolder.cpp b/src/messaging/maildir/maildirFolder.cpp
index 85e041aa..0edb0f4c 100644
--- a/src/messaging/maildirFolder.cpp
+++ b/src/messaging/maildir/maildirFolder.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildir/maildirFolder.hpp"
 
-#include "vmime/messaging/maildirStore.hpp"
-#include "vmime/messaging/maildirMessage.hpp"
-#include "vmime/messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildir/maildirStore.hpp"
+#include "vmime/messaging/maildir/maildirMessage.hpp"
+#include "vmime/messaging/maildir/maildirUtils.hpp"
 
 #include "vmime/utility/smartPtr.hpp"
 
@@ -33,6 +33,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace maildir {
 
 
 maildirFolder::maildirFolder(const folder::path& path, maildirStore* store)
@@ -1344,5 +1345,6 @@ const utility::file::path maildirFolder::getMessageFSPath(const int number)
 }
 
 
+} // maildir
 } // messaging
 } // vmime
diff --git a/src/messaging/maildirMessage.cpp b/src/messaging/maildir/maildirMessage.cpp
index 0a4c27e8..9b728359 100644
--- a/src/messaging/maildirMessage.cpp
+++ b/src/messaging/maildir/maildirMessage.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/maildirMessage.hpp"
-#include "vmime/messaging/maildirFolder.hpp"
-#include "vmime/messaging/maildirUtils.hpp"
+#include "vmime/messaging/maildir/maildirMessage.hpp"
+#include "vmime/messaging/maildir/maildirFolder.hpp"
+#include "vmime/messaging/maildir/maildirUtils.hpp"
 
-#include "vmime/messageParser.hpp"   // to include "message.hpp" in root directory
+#include "vmime/message.hpp"
 
 #include "vmime/exception.hpp"
 #include "vmime/platformDependant.hpp"
@@ -29,6 +29,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace maildir {
 
 
 //
@@ -499,5 +500,6 @@ header& maildirMessage::getOrCreateHeader()
 }
 
 
+} // maildir
 } // messaging
 } // vmime
diff --git a/src/messaging/maildirStore.cpp b/src/messaging/maildir/maildirStore.cpp
index 7d8e493d..7188a281 100644
--- a/src/messaging/maildirStore.cpp
+++ b/src/messaging/maildir/maildirStore.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/maildirStore.hpp"
+#include "vmime/messaging/maildir/maildirStore.hpp"
 
-#include "vmime/messaging/maildirFolder.hpp"
+#include "vmime/messaging/maildir/maildirFolder.hpp"
 
 #include "vmime/utility/smartPtr.hpp"
 
@@ -29,6 +29,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace maildir {
 
 
 maildirStore::maildirStore(session* sess, authenticator* auth)
@@ -228,5 +229,6 @@ const std::vector <string> maildirStore::_infos::getAvailableProperties() const
 }
 
 
+} // maildir
 } // messaging
 } // vmime
diff --git a/src/messaging/maildirUtils.cpp b/src/messaging/maildir/maildirUtils.cpp
index 3479bdeb..4476b3dd 100644
--- a/src/messaging/maildirUtils.cpp
+++ b/src/messaging/maildir/maildirUtils.cpp
@@ -17,14 +17,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/maildirUtils.hpp"
-#include "vmime/messaging/maildirStore.hpp"
+#include "vmime/messaging/maildir/maildirUtils.hpp"
+#include "vmime/messaging/maildir/maildirStore.hpp"
 
 #include "vmime/utility/random.hpp"
 
 
 namespace vmime {
 namespace messaging {
+namespace maildir {
 
 
 const vmime::word maildirUtils::TMP_DIR("tmp", vmime::charset(vmime::charsets::US_ASCII));  // ensure reliable delivery (not to be listed)
@@ -188,5 +189,6 @@ const bool maildirUtils::messageIdComparator::operator()
 }
 
 
+} // maildir
 } // messaging
 } // vmime