diff --git a/messagecore/src/misc/mailinglist.cpp b/messagecore/src/misc/mailinglist.cpp
--- a/messagecore/src/misc/mailinglist.cpp
+++ b/messagecore/src/misc/mailinglist.cpp
@@ -235,7 +235,7 @@
     return header;
 }
 
-static const MagicDetectorFunc magic_detector[] = {
+static const MagicDetectorFunc magic_detectors[] = {
     check_list_id,
     check_list_post,
     check_sender,
@@ -247,8 +247,6 @@
     check_x_ml_name
 };
 
-static const int num_detectors = sizeof(magic_detector) / sizeof(magic_detector[0]);
-
 static QStringList headerToAddress(const QString &header)
 {
     QStringList addresses;
@@ -355,8 +353,8 @@
         return QString();
     }
 
-    for (int i = 0; i < num_detectors; ++i) {
-        mailingList = magic_detector[i](message, headerName, headerValue);
+    for (const MagicDetectorFunc &detector : magic_detectors) {
+        mailingList = detector(message, headerName, headerValue);
         if (!mailingList.isNull()) {
             return mailingList;
         }