diff --git a/src/vmime/net/imap/IMAPMessage.cpp b/src/vmime/net/imap/IMAPMessage.cpp
index 0bf8fbe6..fa33b83a 100644
--- a/src/vmime/net/imap/IMAPMessage.cpp
+++ b/src/vmime/net/imap/IMAPMessage.cpp
@@ -109,7 +109,7 @@ IMAPMessage::IMAPMessage(
 )
 	: m_folder(folder),
 	  m_num(num),
-	  m_size(-1U),
+	  m_size(-1),
 	  m_flags(FLAG_UNDEFINED),
 	  m_expunged(false),
 	  m_modseq(0),
@@ -180,7 +180,7 @@ vmime_uint64 IMAPMessage::getModSequence() const {
 
 size_t IMAPMessage::getSize() const {
 
-	if (m_size == -1U) {
+	if (m_size == static_cast<size_t>(-1)) {
 		throw exceptions::unfetched_object();
 	}
 
diff --git a/src/vmime/net/imap/IMAPParser.hpp b/src/vmime/net/imap/IMAPParser.hpp
index e71b403f..78b76973 100644
--- a/src/vmime/net/imap/IMAPParser.hpp
+++ b/src/vmime/net/imap/IMAPParser.hpp
@@ -956,7 +956,6 @@ class VMIME_EXPORT IMAPParser : public object {
 		bool parseImpl(IMAPParser& parser, string& line, size_t* currentPos) {
 
 			size_t pos = *currentPos;
-			size_t len = 0;
 			bool valid = false;
 
 			value.reserve(line.length() - pos);
@@ -977,7 +976,6 @@ class VMIME_EXPORT IMAPParser : public object {
 					quoted = false;
 
 					++pos;
-					++len;
 
 				} else {
 
@@ -986,7 +984,6 @@ class VMIME_EXPORT IMAPParser : public object {
 						quoted = true;
 
 						++pos;
-						++len;
 
 					} else if (c == '"') {
 
@@ -999,7 +996,6 @@ class VMIME_EXPORT IMAPParser : public object {
 						value += c;
 
 						++pos;
-						++len;
 
 					} else {
 
@@ -3712,7 +3708,7 @@ class VMIME_EXPORT IMAPParser : public object {
 
 			VIMAP_PARSER_CHECK(one_char <'('> );
 
-			items.push_back(std::move(std::unique_ptr <msg_att_item>(parser.get <msg_att_item>(line, &pos))));
+			items.push_back(std::unique_ptr <msg_att_item>(parser.get <msg_att_item>(line, &pos)));
 
 			while (!VIMAP_PARSER_TRY_CHECK(one_char <')'> )) {
 				VIMAP_PARSER_CHECK(SPACE);
@@ -4501,9 +4497,7 @@ class VMIME_EXPORT IMAPParser : public object {
 			while ((resp = parser.get <IMAPParser::continue_req_or_response_data>(curLine, &pos))) {
 
 				continue_req_or_response_data.push_back(
-					std::move(
-						std::unique_ptr <IMAPParser::continue_req_or_response_data>(resp)
-					)
+					std::unique_ptr <IMAPParser::continue_req_or_response_data>(resp)
 				);
 
 				// Partial response (continue_req)