diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp
index 6f33929002..8297b9de54 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp
@@ -297,7 +297,7 @@ IMAPProtocol::SendCommand(const char* command, int32 commandID)
 		return B_NO_MEMORY;
 
 	static char cmd[256];
-	::sprintf(cmd, "A%.7ld %s"CRLF, commandID, command);
+	::sprintf(cmd, "A%.7" B_PRId32 " %s"CRLF, commandID, command);
 
 	TRACE("_SendCommand: %s\n", cmd);
 	int commandLength = strlen(cmd);
@@ -347,7 +347,7 @@ IMAPProtocol::HandleResponse(int32 commandID, bigtime_t timeout,
 		for (std::vector<int32>::iterator it = fOngoingCommands.begin();
 			it != fOngoingCommands.end(); it++) {
 			static char idString[8];
-			::sprintf(idString, "A%.7ld", *it);
+			::sprintf(idString, "A%.7" B_PRId32, *it);
 			if (line.FindFirst(idString) >= 0) {
 				if (*it == commandID) {
 					BString result = IMAPParser::ExtractElementAfter(line,
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
index 17c6f043de..762fad56f3 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
@@ -240,7 +240,7 @@ IMAPStorage::DeleteMessage(int32 uid)
 	BPath filePath = fMailboxPath;
 	filePath.Append(storageEntry.fileName);
 	BEntry entry(filePath.Path());
-	TRACE("IMAPStorage::DeleteMessage %s, %ld\n", filePath.Path(), uid);
+	TRACE("IMAPStorage::DeleteMessage %s, %" B_PRId32 "\n", filePath.Path(), uid);
 
 	status_t status = entry.Remove();
 	if (status != B_OK)