--- Hotmail.pm.orig     2010-03-25 13:35:15.000000000 +0000
+++ /home/fbl/lib/Email/ARF/Hotmail.pm  2010-04-06 17:28:24.000000000 +0000
@@ -30,13 +30,17 @@
 our $VERSION = '0.04';
 $VERSION = eval $VERSION;

+sub extract_hotmail_inline_attachment {
+
+}
+
 sub create_report {
        my $class = shift;
        my $message = shift;

        my $parsed = Email::MIME->new($message);

-       if ($parsed->header("X-Original-Sender") eq 'staff@hotmail.com' or $parsed->header("Sender") eq 'staff@hotmail.com') {
+       if ($parsed->header("From") eq 'staff@hotmail.com' ) {
                my $description = "An email abuse report from hotmail";
                my %fields;
                $fields{"Feedback-Type"} = "abuse";
@@ -44,7 +48,7 @@
                $fields{"Version"} = "0.1";
                my ($source_ip) = ($parsed->header("Subject") =~ /^complaint about message from (\w+$)/);
                $fields{"Source-IP"} = $source_ip;
-               my $original_email = ($parsed->parts)[0];
+               my $original_email = ($parsed->parts)[0]->body;

                return Email::ARF::Report->create(
                                original_email => $original_email,