die "The third argument to create_mime_message must be an arrayref" unless ref($attachments) eq 'ARRAY';
# Build the message
- my $msg = MIME::Entity->build(@{$headers},
+ # MIME::Entity is stupid, and doesn't rfc1522 encode its headers, so we do it for it.
+ my $msg = MIME::Entity->build('Content-Type' => 'text/plain; charset=utf-8',
+ 'Encoding' => 'quoted-printable',
+ (map{encode_rfc1522($_)} @{$headers}),
Data => $body
);
else {
# This is *craptacular*, but because various MTAs
# (sendmail and exim4, at least) appear to eat From
- # lines in message/rfc822 attachments, we need to make
- # sure the From line is the first thing in the
- # attachement, not the second, so if it gets eaten, the
- # headers don't collide into the body.
+ # lines in message/rfc822 attachments, we need eat
+ # the entire From line ourselves so the MTA doesn't
+ # leave \n detrius around.
if (ref($attachment) eq 'ARRAY' and $attachment->[1] =~ /^From /) {
# make a copy so that we don't screw up anything
# that is expecting this arrayref to stay constant
$attachment = [@{$attachment}];
- # flip the From and Received lines around
- @{$attachment}[qw(1 0)] = @{$attachment}[qw(0 1)];
+ # remove the from line
+ splice @$attachment, 1, 1;
}
elsif (not ref($attachment)) {
- # It's a scalar
- $attachment =~ s/^(Received:[^\n]+\n)(From [^\n]+\n)/$2$1/s;
+ # It's a scalar; remove the from line
+ $attachment =~ s/^(Received:[^\n]+\n)(From [^\n]+\n)/$1/s;
}
$msg->attach(Type => 'message/rfc822',
Data => $attachment,