--- amavisd.orig	2006-01-11 22:32:28.000000000 -0800
+++ amavisd	2006-01-11 22:34:49.000000000 -0800
@@ -4469,21 +4469,21 @@
 ###     # to reduce likelyhood of a qmail bare-LF bug (bare LF reported when
 ###     # CR and LF are separated by a TCP packet boundary) one may use this
 ###     # 'while' loop, reading line by line, instead of the normal one below
-###     for (undef $!; defined($buff=$msg->getline); undef $!) {
-###       $smtp_handle->datasend($buff)
-###         or die "datasend timed out while sending body";
-###     }
-###     defined $buff || $!==0  or die "Error reading: $!";
+        for (undef $!; defined($buff=$msg->getline); undef $!) {
+          $smtp_handle->datasend($buff)
+            or die "datasend timed out while sending body";
+        }
+        defined $buff || $!==0  or die "Error reading: $!";
 
         # must flush buffering through $smtp_data_fh, as from now on
         # we'll be calling Net::Cmd::datasend directly for speed
         $smtp_data_fh->flush or die "Error flushing smtp_data_fh: $!";
 
-        while (($nbytes=$msg->read($buff,16384)) > 0) {
-          $smtp_handle->datasend($buff)
-            or die "datasend timed out while sending body";
-        }
-        defined $nbytes or die "Error reading: $!";
+###     while (($nbytes=$msg->read($buff,16384)) > 0) {
+###       $smtp_handle->datasend($buff)
+###         or die "datasend timed out while sending body";
+###     }
+###     defined $nbytes or die "Error reading: $!";
       }
       $smtp_data_fh->close or die "Error closing smtp_data_fh: $!";
       $smtp_data_fh = undef;