3 files changed, 10 insertions, 10 deletions
diff --git a/src/net/maildir/format/courierMaildirFormat.cpp b/src/net/maildir/format/courierMaildirFormat.cpp
index 033951a1..58176a27 100644
--- a/src/net/maildir/format/courierMaildirFormat.cpp
+++ b/src/net/maildir/format/courierMaildirFormat.cpp
@@ -91,7 +91,7 @@ void courierMaildirFormat::destroyFolder(const folder::path& path)
 	// Recursively delete directories of subfolders
 	const std::vector <folder::path> folders = listFolders(path, true);
 
-	for (unsigned int i = 0, n = folders.size() ; i < n ; ++i)
+	for (std::vector <folder::path>::size_type i = 0, n = folders.size() ; i < n ; ++i)
 	{
 		maildirUtils::recursiveFSDelete(fsf->create
 			(folderPathToFileSystemPath(folders[i], ROOT_DIRECTORY)));
@@ -108,7 +108,7 @@ void courierMaildirFormat::renameFolder
 {
 	const std::vector <folder::path> folders = listFolders(oldPath, true);
 
-	for (unsigned int i = 0, n = folders.size() ; i < n ; ++i)
+	for (std::vector <folder::path>::size_type i = 0, n = folders.size() ; i < n ; ++i)
 	{
 		const folder::path folderOldPath = folders[i];
 
@@ -188,7 +188,7 @@ const utility::file::path courierMaildirFormat::folderPathToFileSystemPath
 	{
 		string folderComp;
 
-		for (int i = 0, n = path.getSize() ; i < n ; ++i)
+		for (size_t i = 0, n = path.getSize() ; i < n ; ++i)
 			folderComp += "." + toModifiedUTF7(path[i]);
 
 		fsPath /= utility::file::path::component(folderComp);
@@ -237,7 +237,7 @@ const std::vector <folder::path> courierMaildirFormat::listFolders
 	// Then, map directories to folders
 	std::vector <folder::path> folders;
 
-	for (unsigned int i = 0, n = dirs.size() ; i < n ; ++i)
+	for (std::vector <string>::size_type i = 0, n = dirs.size() ; i < n ; ++i)
 	{
 		const string dir = dirs[i].substr(1) + ".";
 		folder::path path;
@@ -273,7 +273,7 @@ bool courierMaildirFormat::listDirectories(const folder::path& root,
 
 		if (!root.isRoot())
 		{
-			for (int i = 0, n = root.getSize() ; i < n ; ++i)
+			for (size_t i = 0, n = root.getSize() ; i < n ; ++i)
 				base += "." + toModifiedUTF7(root[i]);
 		}
 
diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp
index cbea38ee..d8ca8695 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/net/maildir/maildirFolder.cpp
@@ -505,7 +505,7 @@ void maildirFolder::listFolders(std::vector <ref <folder> >& list, const bool re
 
 		list.reserve(pathList.size());
 
-		for (unsigned int i = 0, n = pathList.size() ; i < n ; ++i)
+		for (std::vector <folder::path>::size_type i = 0, n = pathList.size() ; i < n ; ++i)
 		{
 			ref <maildirFolder> subFolder =
 				vmime::create <maildirFolder>(pathList[i], store);
@@ -1264,7 +1264,7 @@ void maildirFolder::expunge()
 
 	if (!nums.empty())
 	{
-		for (int i = nums.size() - 1 ; i >= 0 ; --i)
+		for (std::vector <int>::size_type i = nums.size() - 1 ; i >= 0 ; --i)
 			m_messageInfos.erase(m_messageInfos.begin() + i);
 	}
 
diff --git a/src/net/maildir/maildirMessage.cpp b/src/net/maildir/maildirMessage.cpp
index dd38cbd8..0bd1b277 100644
--- a/src/net/maildir/maildirMessage.cpp
+++ b/src/net/maildir/maildirMessage.cpp
@@ -143,17 +143,17 @@ public:
 	}
 
 
-	ref <const part> getPartAt(const int x) const
+	ref <const part> getPartAt(const size_t x) const
 	{
 		return m_parts[x];
 	}
 
-	ref <part> getPartAt(const int x)
+	ref <part> getPartAt(const size_t x)
 	{
 		return m_parts[x];
 	}
 
-	int getPartCount() const
+	size_t getPartCount() const
 	{
 		return m_parts.size();
 	}