--- amavisd.conf-sample	2004-09-06 20:30:43.000000000 +0200
+++ amavisd.conf-sample	2004-09-17 23:58:01.000000000 +0200
@@ -1,8 +1,5 @@
 use strict;
 
-# Sample configuration file for amavisd-new (traditional style, chatty,
-# you may prefer to start with the more concise supplied amavisd.conf)
-#
 # This software is licensed under the GNU General Public License (GPL).
 # See comments at the start of amavisd-new for the whole license text.
 
@@ -69,8 +66,8 @@
 
 # Set the user and group to which the daemon will change if started as root
 # (otherwise just keeps the UID unchanged, and these settings have no effect):
-$daemon_user  = 'vscan';   # (no default;  customary: vscan or amavis)
-$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis or sweep)
+$daemon_user  = 'amavis';   # (no default;  customary: vscan or amavis)
+$daemon_group = 'amavis';   # (no default;  customary: vscan or amavis or sweep)
 
 # Runtime working directory (cwd), and a place where
 # temporary directories for unpacking mail are created.
@@ -567,7 +564,7 @@
 #   or a directory (no trailing slash)
 #   (the default value is undef, meaning no quarantine)
 #
-$QUARANTINEDIR = '/var/virusmails';
+$QUARANTINEDIR = "$MYHOME/quarantine";
 
 #$virus_quarantine_method        = 'local:virus-%i-%n';    # default
 #$spam_quarantine_method         = 'local:spam-%b-%i-%n';  # default
@@ -697,7 +694,7 @@
 $defang_virus  = 1;  # default is false: don't modify mail body
 $defang_banned = 1;  # default is false: don't modify mail body
 # $defang_bad_header     = 1;  # default is false: don't modify mail body
-# $defang_undecipherable = 1;  # default is false: don't modify mail body
+$defang_undecipherable = 1;  # default is false: don't modify mail body
 # $defang_spam = 1;  # default is false: don't modify mail body
 
 $remove_existing_x_scanned_headers = 0; # leave existing X-Virus-Scanned alone
@@ -1384,7 +1381,7 @@
 # NOTE: if $daemon_chroot_dir is nonempty, the directories will be
 #       relative to the chroot directory specified;
 
-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
+$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin:/opt/bin';
 
 # Specify one string or a search list of strings (first match wins).
 # The string (or: each string in a list) may be an absolute path,