diff --git a/src/kits/mail/MailChain.cpp b/src/kits/mail/MailChain.cpp
index e4ef7704ef..fa3a7c74fb 100644
--- a/src/kits/mail/MailChain.cpp
+++ b/src/kits/mail/MailChain.cpp
@@ -89,7 +89,7 @@ BMailChain::Load(BMessage* settings)
 	if (fSettingsCount != fAddonsCount)
 		return B_MISMATCHED_VALUES;
 
-	for (int i = 0;;i++) {
+	for (int i = 0;i < fSettingsCount;i++) {
 		BMessage* filter = new BMessage();
 		entry_ref* ref = new entry_ref();
 		char* addon_path;