--- src/dspam.c-old	2005-03-22 15:52:29.000000000 +0100
+++ src/dspam.c	2005-03-22 15:52:21.000000000 +0100
@@ -599,7 +599,7 @@
         strcmp(_ds_pref_val(PTX, "trainPristine"), "on")) 
     add_xdspam_headers(CTX, ATX, PTX);
 
-  if (!strcmp(_ds_pref_val(PTX, "spamAction"), "tag") && 
+  if ((strstr(_ds_pref_val(PTX, "spamAction"), "tag")!=NULL) && 
       result == DSR_ISSPAM)
   {
     tag_message((struct _ds_message_block *) CTX->message->components->first->ptr, PTX);
@@ -1563,8 +1563,8 @@
           if (ATX->source != DSS_CORPUS) {
             if (ATX->spam_args[0] != 0 || 
                  (PTX != NULL && 
-                   ( !strcmp(_ds_pref_val(PTX, "spamAction"), "tag") ||
-                     !strcmp(_ds_pref_val(PTX, "spamAction"), "deliver") )
+                   ( strstr(_ds_pref_val(PTX, "spamAction"), "tag")!=NULL ||
+                     strstr(_ds_pref_val(PTX, "spamAction"), "deliver")!=NULL )
                  )
                )
             {