--- amavis.in	Thu Dec  7 16:56:16 2000
+++ amavis.in.patched	Sun Jan  7 00:13:06 2001
@@ -351,7 +351,18 @@
 	# First we quarantine the original email messages
 	if ($TESTING ne "yes") {
 		if ($virusbackup eq "yes") {
-			`mv $TEMPDIR/email.txt $QUARANTINE/$VIRUSFILE`;
+			my $recipient;
+			open(QUARANTINEFILE,">$QUARANTINE/$VIRUSFILE");
+			print QUARANTINEFILE "X-Quarantined-From: $SENDER\n";
+			foreach $recipient (@RECIPS) {
+				print QUARANTINEFILE "X-Quarantined-To: $recipient\n";
+			}
+			open(EMAILFILE,"$TEMPDIR/email.txt");
+			while (<EMAILFILE>) {
+				print QUARANTINEFILE $_;
+			}
+			close(EMAILFILE);
+			close(QUARANTINEFILE);
 
 			do_debug("Virus quarantined as $VIRUSFILE\n");
 			do_log("Virus found - quarantined as $VIRUSFILE");