X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=2e2a60cec10e940bbce0df9781a94b3bb2923097;hb=1043d7f814fccf5864e677b1e38577d0a150026c;hp=3cf2053648c5902f6bb2eb082f83c608ce382408;hpb=de46c7042907923c9b88af67849dddab9a5101ba;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 3cf205364..2e2a60cec 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -33,6 +33,7 @@ package Mailer;
 use Email::Address;
 
 use SL::Common;
+use SL::MIME;
 use SL::Template;
 
 my $num_sent = 0;
@@ -181,10 +182,10 @@ $self->{message}
         $filename =~ s/(.*\/|\Q$self->{fileid}\E)//g;
       }
 
-      my $application =
-        ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
-        ? "text"
-        : "application";
+      my $application    = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? "text" : "application";
+      my $content_type   = SL::MIME->mime_type_from_ext($filename);
+      $content_type      = "${application}/$self->{format}" if (!$content_type && $self->{format});
+      $content_type    ||= 'application/octet-stream';
 
       open(IN, $attachment);
       if ($?) {
@@ -201,7 +202,7 @@ $self->{message}
       }
 
       print OUT qq|--${boundary}
-Content-Type: $application/$self->{format}; name="$filename"$attachment_charset
+Content-Type: ${content_type}; name="$filename"$attachment_charset
 Content-Transfer-Encoding: BASE64
 Content-Disposition: attachment; filename="$filename"\n\n|;