--- PerMsgStatus.pm.orig	2004-01-20 21:40:04.000000000 +0000
+++ PerMsgStatus.pm	2004-01-24 17:34:45.000000000 +0000
@@ -1013,11 +1013,15 @@
 
 	if (/^Content-Type: (\S+?\/\S+?)(?:\;|\s|$)/i) {
 	  $ctype = $1;
-	  if ($ctype =~ /^(text\/\S+|message\/\S+|multipart\/alternative|multipart\/related)/i)
-	  {
-	    $ctypeistext = 1; next;
+	  if ($self->{conf}->{decode_attachments}) {
+	    $ctypeistext = 1;
 	  } else {
-	    $ctypeistext = 0; next;
+	    if ($ctype =~ /^(text\/\S+|message\/\S+|multipart\/alternative|multipart\/related)/i)
+	    {
+	      $ctypeistext = 1; next;
+	    } else {
+	      $ctypeistext = 0; next;
+	    }
 	  }
 	}
       }
