diff --git a/src/servers/mail/MailDaemon.cpp b/src/servers/mail/MailDaemon.cpp
index f980450b2f..f121213b08 100644
--- a/src/servers/mail/MailDaemon.cpp
+++ b/src/servers/mail/MailDaemon.cpp
@@ -38,7 +38,7 @@ makeIndices()
 		B_MAIL_ATTR_CC, B_MAIL_ATTR_FROM, B_MAIL_ATTR_NAME,
 		B_MAIL_ATTR_PRIORITY, B_MAIL_ATTR_REPLY, B_MAIL_ATTR_STATUS,
 		B_MAIL_ATTR_SUBJECT, B_MAIL_ATTR_TO, B_MAIL_ATTR_THREAD,
-		NULL
+		B_MAIL_ATTR_ACCOUNT, NULL
 	};
 
 	// add mail indices for all devices capable of querying
@@ -57,7 +57,7 @@ makeIndices()
 		fs_create_index(device, "MAIL:draft", B_INT32_TYPE, 0);
 		fs_create_index(device, B_MAIL_ATTR_WHEN, B_INT32_TYPE, 0);
 		fs_create_index(device, B_MAIL_ATTR_FLAGS, B_INT32_TYPE, 0);
-		fs_create_index(device, B_MAIL_ATTR_ACCOUNT, B_INT32_TYPE, 0);
+		fs_create_index(device, B_MAIL_ATTR_ACCOUNT_ID, B_INT32_TYPE, 0);
 		fs_create_index(device, B_MAIL_ATTR_READ, B_INT32_TYPE, 0);
 	}
 }