diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolder.h b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolder.h
index 75d2982ec0..9742fefbf6 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolder.h
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolder.h
@@ -10,6 +10,7 @@
 #include <sys/stat.h>
 
 #include <Entry.h>
+#include <Node.h>
 #include <Handler.h>
 #include <String.h>
 
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Response.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Response.cpp
index 46d83f37fb..101e6ff011 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Response.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/Response.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2011-2012, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
@@ -39,7 +39,7 @@ RFC3501Encoding::RFC3501Encoding()
 	if (!kInverseBase64Initialized) {
 		// This is not thread safe, but it's not harmful
 		for (size_t i = 0; i < sizeof(kBase64Alphabet); i++)
-			kInverseBase64Alphabet[kBase64Alphabet[i]] = i + 1;
+			kInverseBase64Alphabet[(int)kBase64Alphabet[i]] = i + 1;
 		kInverseBase64Initialized = true;
 	}
 }