Index: spamass-milter.cpp
===================================================================
RCS file: /cvsroot/spamass-milt/spamass-milt/spamass-milter.cpp,v
retrieving revision 1.52
diff -u -r1.52 spamass-milter.cpp
--- spamass-milter.cpp	26 Jun 2003 15:10:44 -0000	1.52
+++ spamass-milter.cpp	2 Dec 2003 16:32:45 -0000
@@ -386,10 +386,6 @@
   /* Drop the message into the spam bucket if it's spam */
   if ( flag_bucket ) {
         if ( assassin->spam_flag().size() > 0 ) {
-          // first, add the spambucket address
-          if ( smfi_addrcpt( ctx, spambucket ) != MI_SUCCESS ) {
-                throw string( "Failed to add spambucket to recipients" );
-          }
           if (flag_bucket_only) {
                 // Move recipients to a non-active header, one at a
                 // time. Note, this may generate multiple X-Spam-Orig-To
@@ -406,6 +402,10 @@
                   }
                   assassin->recipients.pop_front();
                 }
+          }
+          // then add the spambucket address
+          if ( smfi_addrcpt( ctx, spambucket ) != MI_SUCCESS ) {
+                throw string( "Failed to add spambucket to recipients" );
           }
         }
   }