--- Message.pm.old	2005-09-20 21:44:11.872199536 +0100
+++ Message.pm	2005-09-20 21:45:06.537508583 +0100
@@ -994,13 +994,19 @@
 # ---------------------------------------------------------------------------
 
 sub get_decoded_body_text_array {
-  my ($self) = @_;
+  my ($self, $decode_attachments) = @_;
 
   if (defined $self->{text_decoded}) { return $self->{text_decoded}; }
   $self->{text_decoded} = [ ];
 
   # Find all parts which are leaves
-  my @parts = $self->find_parts(qr/^(?:text|message)\b/i,1);
+  # JKF Do we want to decode all the binary attachments as well?
+  my @parts;
+  if ($decode_attachments) {
+   @parts = $self->find_parts(qr/./,1);
+  } else {
+   @parts = $self->find_parts(qr/^(?:text|message)\b/i,1);
+  }
   return $self->{text_decoded} unless @parts;
 
   # Go through each part
