6 files changed, 33 insertions, 21 deletions
diff --git a/src/messaging/IMAPConnection.cpp b/src/messaging/imap/IMAPConnection.cpp
index fa0e6af8..0f5934c8 100644
--- a/src/messaging/IMAPConnection.cpp
+++ b/src/messaging/imap/IMAPConnection.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/IMAPTag.hpp"
-#include "vmime/messaging/IMAPConnection.hpp"
-#include "vmime/messaging/IMAPUtils.hpp"
-#include "vmime/messaging/IMAPStore.hpp"
+#include "vmime/messaging/imap/IMAPTag.hpp"
+#include "vmime/messaging/imap/IMAPConnection.hpp"
+#include "vmime/messaging/imap/IMAPUtils.hpp"
+#include "vmime/messaging/imap/IMAPStore.hpp"
 
 #include "vmime/exception.hpp"
 #include "vmime/platformDependant.hpp"
@@ -30,6 +30,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace imap {
 
 
 IMAPConnection::IMAPConnection(IMAPStore* store, authenticator* auth)
@@ -259,5 +260,6 @@ IMAPParser::response* IMAPConnection::readResponse(IMAPParser::literalHandler* l
 }
 
 
+} // imap
 } // messaging
 } // vmime
diff --git a/src/messaging/IMAPFolder.cpp b/src/messaging/imap/IMAPFolder.cpp
index 98737165..5bbfa148 100644
--- a/src/messaging/IMAPFolder.cpp
+++ b/src/messaging/imap/IMAPFolder.cpp
@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/IMAPFolder.hpp"
+#include "vmime/messaging/imap/IMAPFolder.hpp"
 
-#include "vmime/messaging/IMAPStore.hpp"
-#include "vmime/messaging/IMAPParser.hpp"
-#include "vmime/messaging/IMAPMessage.hpp"
-#include "vmime/messaging/IMAPUtils.hpp"
-#include "vmime/messaging/IMAPConnection.hpp"
+#include "vmime/messaging/imap/IMAPStore.hpp"
+#include "vmime/messaging/imap/IMAPParser.hpp"
+#include "vmime/messaging/imap/IMAPMessage.hpp"
+#include "vmime/messaging/imap/IMAPUtils.hpp"
+#include "vmime/messaging/imap/IMAPConnection.hpp"
 
 #include "vmime/message.hpp"
 
@@ -36,6 +36,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace imap {
 
 
 IMAPFolder::IMAPFolder(const folder::path& path, IMAPStore* store, const int type, const int flags)
@@ -1555,5 +1556,6 @@ void IMAPFolder::status(int& count, int& unseen)
 }
 
 
+} // imap
 } // messaging
 } // vmime
diff --git a/src/messaging/IMAPMessage.cpp b/src/messaging/imap/IMAPMessage.cpp
index bfe72159..629668c5 100644
--- a/src/messaging/IMAPMessage.cpp
+++ b/src/messaging/imap/IMAPMessage.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/IMAPParser.hpp"
-#include "vmime/messaging/IMAPMessage.hpp"
-#include "vmime/messaging/IMAPFolder.hpp"
-#include "vmime/messaging/IMAPStore.hpp"
-#include "vmime/messaging/IMAPConnection.hpp"
-#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/imap/IMAPParser.hpp"
+#include "vmime/messaging/imap/IMAPMessage.hpp"
+#include "vmime/messaging/imap/IMAPFolder.hpp"
+#include "vmime/messaging/imap/IMAPStore.hpp"
+#include "vmime/messaging/imap/IMAPConnection.hpp"
+#include "vmime/messaging/imap/IMAPUtils.hpp"
 
 #include <sstream>
 #include <iterator>
@@ -30,6 +30,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace imap {
 
 
 //
@@ -837,5 +838,6 @@ void IMAPMessage::setFlags(const int flags, const int mode)
 }
 
 
+} // imap
 } // messaging
 } // vmime
diff --git a/src/messaging/IMAPStore.cpp b/src/messaging/imap/IMAPStore.cpp
index 809957a4..81eab9a7 100644
--- a/src/messaging/IMAPStore.cpp
+++ b/src/messaging/imap/IMAPStore.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/IMAPStore.hpp"
-#include "vmime/messaging/IMAPFolder.hpp"
-#include "vmime/messaging/IMAPConnection.hpp"
+#include "vmime/messaging/imap/IMAPStore.hpp"
+#include "vmime/messaging/imap/IMAPFolder.hpp"
+#include "vmime/messaging/imap/IMAPConnection.hpp"
 
 #include "vmime/exception.hpp"
 #include "vmime/platformDependant.hpp"
@@ -29,6 +29,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace imap {
 
 
 #ifndef VMIME_BUILDING_DOC
@@ -288,5 +289,6 @@ const std::vector <string> IMAPStore::_infos::getAvailableProperties() const
 }
 
 
+} // imap
 } // messaging
 } // vmime
diff --git a/src/messaging/IMAPTag.cpp b/src/messaging/imap/IMAPTag.cpp
index f5c669a0..bc6b656d 100644
--- a/src/messaging/IMAPTag.cpp
+++ b/src/messaging/imap/IMAPTag.cpp
@@ -17,11 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/IMAPTag.hpp"
+#include "vmime/messaging/imap/IMAPTag.hpp"
 
 
 namespace vmime {
 namespace messaging {
+namespace imap {
 
 
 const int IMAPTag::sm_maxNumber = 52 * 10 * 10 * 10;
@@ -93,5 +94,6 @@ void IMAPTag::generate()
 }
 
 
+} // imap
 } // messaging
 } // vmime
diff --git a/src/messaging/IMAPUtils.cpp b/src/messaging/imap/IMAPUtils.cpp
index de0c8d30..3a41598d 100644
--- a/src/messaging/IMAPUtils.cpp
+++ b/src/messaging/imap/IMAPUtils.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/IMAPUtils.hpp"
+#include "vmime/messaging/imap/IMAPUtils.hpp"
 #include "vmime/messaging/message.hpp"
 
 #include <sstream>
@@ -27,6 +27,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace imap {
 
 
 const string IMAPUtils::quoteString(const string& text)
@@ -549,5 +550,6 @@ const string IMAPUtils::dateTime(const vmime::datetime& date)
 }
 
 
+} // imap
 } // messaging
 } // vmime