diff --git a/src/messaging/maildirStore.cpp b/src/messaging/maildirStore.cpp
index 2e125109..520e6bbb 100644
--- a/src/messaging/maildirStore.cpp
+++ b/src/messaging/maildirStore.cpp
@@ -80,8 +80,8 @@ void maildirStore::connect()
 	if (isConnected())
 		throw exceptions::already_connected();
 
-	m_fsPath = platformDependant::getHandler()->getFileSystemFactory()->stringToPath
-		(session().properties()[infos().propertyPrefix() + "server.path"]);
+	m_fsPath = platformDependant::getHandler()->getFileSystemFactory()->
+		stringToPath(session().properties()[infos().propertyPrefix() + "server.rootpath"]);
 
 	m_connected = true;
 }
@@ -155,7 +155,7 @@ const std::vector <string> maildirStore::_infos::availableProperties() const
 {
 	std::vector <string> list;
 
-	list.push_back("server.path");
+	list.push_back("server.rootpath");
 
 	return (list);
 }
diff --git a/src/messaging/serviceFactory.cpp b/src/messaging/serviceFactory.cpp
index 09bced01..35ff3a98 100644
--- a/src/messaging/serviceFactory.cpp
+++ b/src/messaging/serviceFactory.cpp
@@ -69,8 +69,9 @@ service* serviceFactory::create
 	if (u.port() != url::UNSPECIFIED_PORT)
 		sess.properties()[serv->infos().propertyPrefix() + "server.port"] = u.port();
 
-	if (!u.path().empty())
-		sess.properties()[serv->infos().propertyPrefix() + "server.path"] = u.path();
+	// Path portion of the URL is used to point a specific folder (empty = root)
+	//if (!u.path().empty())
+	//	sess.properties()[serv->infos().propertyPrefix() + "server.path"] = u.path();
 
 	if (!u.username().empty())
 	{