--- trunk/MWS.pm	2004/05/03 21:28:46	2
+++ trunk/MWS.pm	2004/05/04 14:00:03	3
@@ -6,6 +6,9 @@
 use warnings;
 use Carp;
 
+use Plucene::Simple;
+use Mail::Box::Manager;
+
 require Exporter;
 
 our @ISA = qw(Exporter);
@@ -88,6 +91,8 @@
 sub fetch_result {
 	my $self = shift;
 
+	my $args = {@_};
+
 	croak "results called before search!" if (! $self->{'index_ids'});
 
 	my $curr = $self->{'curr_result'}++;
@@ -102,6 +107,16 @@
 
 	$row->{'from'} = unroll($message,'from','phrase');
 	$row->{'subject'} = $message->get('Subject');
+	if (! $message->isMultipart) {
+		$row->{'body'} = $message->decoded->string;
+	} else {
+		foreach my $part ($message->parts) {
+			if ($part->body->mimeType eq 'text/plain') {
+				$row->{'body'} = $part->decoded->string;
+				last;
+			}
+		}
+	}
 
 	return $row;