diff -ur qmailadmin-1.2.7/user.c qmailadmin-1.2.7-vale/user.c
--- qmailadmin-1.2.7/user.c     2005-01-03 21:31:09.000000000 +0100
+++ qmailadmin-1.2.7-vale/user.c        2005-03-22 20:37:45.082994824 +0100
@@ -497,7 +497,7 @@
     if(strcmp(spamvalue, "on") == 0) {
        snprintf(NewBuf, sizeof(NewBuf), "%s/.qmail", mypw->pw_dir);
        fs = fopen(NewBuf, "w+");
-       fprintf(fs, "%s\n", SPAM_COMMAND);
+       fprintf (fs, "%s %s@%s %s %s%s\n", SPAM_START, mypw->pw_name, Domain, SPAM_MIDDLE, mypw->pw_dir, SPAM_END);
        fclose(fs);
     }
 #endif
@@ -917,7 +917,7 @@
       if ( (*dotqmailline == '|') &&
           (strstr (dotqmailline, "/true delete") == NULL) &&
           (strstr (dotqmailline, "/autorespond ") == NULL) &&
-          (strstr (dotqmailline, SPAM_COMMAND) == NULL) ) {
+          (strstr (dotqmailline, SPAM_START) == NULL) ) {
         fprintf (fs, "%s\n", dotqmailline);
         emptydotqmail = 0;
       }
@@ -970,8 +970,8 @@
     if (strcmp (cforward, "blackhole") == 0) {
       fprintf (fs, "# delete\n");
       emptydotqmail = 0;
-    } else if (spam_check == 1) {
-      fprintf (fs, "%s\n", SPAM_COMMAND);
+    } else if (spam_check == 1) {
+      fprintf (fs, "%s %s@%s %s %s%s\n", SPAM_START, vpw->pw_name, Domain, SPAM_MIDDLE, vpw->pw_dir, SPAM_END);
       emptydotqmail = 0;
     } else {
       fprintf (fs, "%s/" MAILDIR "/\n", vpw->pw_dir);
@@ -1064,7 +1064,7 @@
               fs2 = fopen (fn, "r");
             }

-            else if (strstr (linebuf, SPAM_COMMAND) != NULL )
+            else if (strstr (linebuf, SPAM_START) != NULL )
               dotqmail_flags |= DOTQMAIL_SPAMCHECK;

             else /* unrecognized program delivery, set a flag so we don't blackhole */