diff --git a/src/config.h b/src/config.h
index ca25a1c..8665832 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,7 +13,7 @@
 
 #define VERSION "1.2.0-master"
 
-#define BUILD 942
+#define BUILD 943
 
 #define HOSTID "mailarchiver"
 
diff --git a/src/parser.c b/src/parser.c
index 7e38b0f..feef184 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -197,10 +197,6 @@
          sdata->restored_copy = 1;
       }
 
-      if(*(cfg->spam_header_line) != '\0' && strncmp(buf, cfg->spam_header_line, strlen(cfg->spam_header_line)) == 0){
-         sdata->spam_message = 1;
-      }
-
       if(sdata->ms_journal == 0 && (strncmp(buf, "X-MS-Journal-Report:", strlen("X-MS-Journal-Report:")) == 0 || (sdata->import == 1 && strncmp(buf, "X-MS-Exchange-Organization-Auth", strlen("X-MS-Exchange-Organization-Auth")) == 0))){
          if(sdata->import == 0){
             sdata->ms_journal = 1;
@@ -347,6 +343,10 @@
 
    if(state->is_header == 1){
 
+      if(*(cfg->spam_header_line) != '\0' && strncmp(buf, cfg->spam_header_line, strlen(cfg->spam_header_line)) == 0){
+         sdata->spam_message = 1;
+      }
+
       if(strncasecmp(buf, "From:", strlen("From:")) == 0) state->message_state = MSG_FROM;
 
       else if(strncasecmp(buf, "Content-Type:", strlen("Content-Type:")) == 0){