Index: clamav-milter/clamfi.c
===================================================================
--- clamav-milter/clamfi.c.orig
+++ clamav-milter/clamfi.c
@@ -90,16 +90,11 @@ static void add_x_header(SMFICTX *ctx, c
 	while(status)
 	    if(smfi_chgheader(ctx, (char *)"X-Virus-Status", status--, NULL) != MI_SUCCESS)
 		logg("^Failed to remove existing X-Virus-Status header\n");
+    }
 	if(smfi_addheader(ctx, (char *)"X-Virus-Scanned", xvirushdr) != MI_SUCCESS)
 	    logg("^Failed to add X-Virus-Scanned header\n");
 	if(smfi_addheader(ctx, (char *)"X-Virus-Status", st) != MI_SUCCESS)
 	    logg("^Failed to add X-Virus-Status header\n");
-    } else { /* Add */
-	if(smfi_insheader(ctx, 1, (char *)"X-Virus-Scanned", xvirushdr) != MI_SUCCESS)
-	    logg("^Failed to insert X-Virus-Scanned header\n");
-	if(smfi_insheader(ctx, 1, (char *)"X-Virus-Status", st) != MI_SUCCESS)
-	    logg("^Failed to insert X-Virus-Status header\n");
-    }
 }
 
 enum CFWHAT {