3 files changed, 14 insertions, 8 deletions
diff --git a/src/messaging/POP3Folder.cpp b/src/messaging/pop3/POP3Folder.cpp
index e0bac1a8..c70e2b5b 100644
--- a/src/messaging/POP3Folder.cpp
+++ b/src/messaging/pop3/POP3Folder.cpp
@@ -17,16 +17,17 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/POP3Folder.hpp"
+#include "vmime/messaging/pop3/POP3Folder.hpp"
 
-#include "vmime/messaging/POP3Store.hpp"
-#include "vmime/messaging/POP3Message.hpp"
+#include "vmime/messaging/pop3/POP3Store.hpp"
+#include "vmime/messaging/pop3/POP3Message.hpp"
 
 #include "vmime/exception.hpp"
 
 
 namespace vmime {
 namespace messaging {
+namespace pop3 {
 
 
 POP3Folder::POP3Folder(const folder::path& path, POP3Store* store)
@@ -814,5 +815,6 @@ void POP3Folder::parseMultiListOrUidlResponse(const string& response, std::map <
 }
 
 
+} // pop3
 } // messaging
 } // vmime
diff --git a/src/messaging/POP3Message.cpp b/src/messaging/pop3/POP3Message.cpp
index 3c84368c..01680d34 100644
--- a/src/messaging/POP3Message.cpp
+++ b/src/messaging/pop3/POP3Message.cpp
@@ -17,15 +17,16 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/POP3Message.hpp"
-#include "vmime/messaging/POP3Folder.hpp"
-#include "vmime/messaging/POP3Store.hpp"
+#include "vmime/messaging/pop3/POP3Message.hpp"
+#include "vmime/messaging/pop3/POP3Folder.hpp"
+#include "vmime/messaging/pop3/POP3Store.hpp"
 
 #include <sstream>
 
 
 namespace vmime {
 namespace messaging {
+namespace pop3 {
 
 
 POP3Message::POP3Message(POP3Folder* folder, const int num)
@@ -212,5 +213,6 @@ void POP3Message::setFlags(const int /* flags */, const int /* mode */)
 }
 
 
+} // pop3
 } // messaging
 } // vmime
diff --git a/src/messaging/POP3Store.cpp b/src/messaging/pop3/POP3Store.cpp
index 3129f14a..d6ece2a0 100644
--- a/src/messaging/POP3Store.cpp
+++ b/src/messaging/pop3/POP3Store.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/POP3Store.hpp"
-#include "vmime/messaging/POP3Folder.hpp"
+#include "vmime/messaging/pop3/POP3Store.hpp"
+#include "vmime/messaging/pop3/POP3Folder.hpp"
 
 #include "vmime/exception.hpp"
 #include "vmime/platformDependant.hpp"
@@ -30,6 +30,7 @@
 
 namespace vmime {
 namespace messaging {
+namespace pop3 {
 
 
 POP3Store::POP3Store(session* sess, authenticator* auth)
@@ -624,5 +625,6 @@ const std::vector <string> POP3Store::_infos::getAvailableProperties() const
 }
 
 
+} // pop3
 } // messaging
 } // vmime