4 files changed, 8 insertions, 8 deletions
diff --git a/src/net/imap/IMAPFolder.cpp b/src/net/imap/IMAPFolder.cpp
index 8eac9eae..ddd53994 100644
--- a/src/net/imap/IMAPFolder.cpp
+++ b/src/net/imap/IMAPFolder.cpp
@@ -590,7 +590,7 @@ std::vector <ref <message> > IMAPFolder::getMessagesByUID(const std::vector <mes
 
 	cmd << "UID FETCH " << IMAPUtils::extractUIDFromGlobalUID(uids[0]);
 
-	for (unsigned int i = 1, n = uids.size() ; i < n ; ++i)
+	for (std::vector <message::uid>::size_type i = 1, n = uids.size() ; i < n ; ++i)
 		cmd << "," << IMAPUtils::extractUIDFromGlobalUID(uids[i]);
 
 	cmd << " UID";
diff --git a/src/net/imap/IMAPMessage.cpp b/src/net/imap/IMAPMessage.cpp
index 45d4699b..55f2108e 100644
--- a/src/net/imap/IMAPMessage.cpp
+++ b/src/net/imap/IMAPMessage.cpp
@@ -233,7 +233,7 @@ void IMAPMessage::fetchPartHeader(ref <part> p)
 
 void IMAPMessage::fetchPartHeaderForStructure(ref <structure> str)
 {
-	for (int i = 0, n = str->getPartCount() ; i < n ; ++i)
+	for (size_t i = 0, n = str->getPartCount() ; i < n ; ++i)
 	{
 		ref <class part> part = str->getPartAt(i);
 
@@ -694,7 +694,7 @@ void IMAPMessage::constructParsedMessage(ref <bodyPart> parentPart, ref <structu
 	}
 	else
 	{
-		for (int i = 0, n = str->getPartCount() ; i < n ; ++i)
+		for (size_t i = 0, n = str->getPartCount() ; i < n ; ++i)
 		{
 			ref <class part> part = str->getPartAt(i);
 
diff --git a/src/net/imap/IMAPStructure.cpp b/src/net/imap/IMAPStructure.cpp
index a0bd98bb..6b0a6c02 100644
--- a/src/net/imap/IMAPStructure.cpp
+++ b/src/net/imap/IMAPStructure.cpp
@@ -59,19 +59,19 @@ IMAPStructure::IMAPStructure(ref <IMAPPart> parent, const std::vector <IMAPParse
 }
 
 
-ref <const part> IMAPStructure::getPartAt(const int x) const
+ref <const part> IMAPStructure::getPartAt(const size_t x) const
 {
 	return m_parts[x];
 }
 
 
-ref <part> IMAPStructure::getPartAt(const int x)
+ref <part> IMAPStructure::getPartAt(const size_t x)
 {
 	return m_parts[x];
 }
 
 
-int IMAPStructure::getPartCount() const
+size_t IMAPStructure::getPartCount() const
 {
 	return m_parts.size();
 }
diff --git a/src/net/imap/IMAPUtils.cpp b/src/net/imap/IMAPUtils.cpp
index 3f1c704b..68507644 100644
--- a/src/net/imap/IMAPUtils.cpp
+++ b/src/net/imap/IMAPUtils.cpp
@@ -122,7 +122,7 @@ const string IMAPUtils::pathToString
 {
 	string result;
 
-	for (int i = 0 ; i < path.getSize() ; ++i)
+	for (size_t i = 0 ; i < path.getSize() ; ++i)
 	{
 		if (i > 0) result += hierarchySeparator;
 		result += toModifiedUTF7(hierarchySeparator, path[i]);
@@ -556,7 +556,7 @@ const string IMAPUtils::listToSet(const std::vector <message::uid>& list)
 
 	res << extractUIDFromGlobalUID(list[0]);
 
-	for (unsigned int i = 1, n = list.size() ; i < n ; ++i)
+	for (std::vector <message::uid>::size_type i = 1, n = list.size() ; i < n ; ++i)
 		res << "," << extractUIDFromGlobalUID(list[i]);
 
 	return res.str();