diff -Nur -x '*.orig' -x '*.rej' qpsmtpd-0.31.1/plugins/queue/smtp-forward mezzanine_patched_qpsmtpd-0.31.1/plugins/queue/smtp-forward
--- qpsmtpd-0.31.1/plugins/queue/smtp-forward	2006-02-12 17:47:02.000000000 -0500
+++ mezzanine_patched_qpsmtpd-0.31.1/plugins/queue/smtp-forward	2006-02-12 17:46:33.000000000 -0500
@@ -78,7 +78,7 @@
 
   $smtp->data();
   $rc = $smtp->code;
-  #$message = $smtp->message;
+  $message = $smtp->message;
   chomp($message);
 
   if ($rc =~ m/^4\d{2}$/ ) {
@@ -92,12 +92,6 @@
   $message = $smtp->message;
   chomp($message);
   
-
-  if ($message =~ m/^End data with/ ) {
-  	(undef, $message) = split(/:/, $message);
-  	if ($message) { $message =~ s/^\s//; }
-  }
-
   if ($rc =~ m/^4\d{2}$/ ) {
         return(DENYSOFT, "Unable to queue message ($message)");
   } elsif ($rc =~ m/^5\d{2}$/ ) {
@@ -113,11 +107,6 @@
     $message = $smtp->message;
     chomp($message);
 
-    if ($message =~ m/^End data with/ ) {
-        (undef, $message) = split(/:/, $message);
-        if ($message) { $message =~ s/^\s//; }
-    }
-
     if ($rc =~ m/^4\d{2}$/ ) {
         return(DENYSOFT, "Unable to queue message ($message)");
     } elsif ($rc =~ m/^5\d{2}$/ ) {
@@ -131,11 +120,6 @@
   my $queue_message;
   chomp($message);
 
-  if ($message =~ m/^End data with/ ) {
-        (undef, $message) = split(/\n/, $message);
-  	if ($message) { $message =~ s/^\s//; }
-  }
-
   if ($rc =~ m/^4\d{2}$/ ) {
         return(DENYSOFT, "Unable to queue message ($message)");
   } elsif ($rc =~ m/^5\d{2}$/ ) {