X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=3cf2053648c5902f6bb2eb082f83c608ce382408;hb=1410996dd10264247f118f1ac6f3a8daaf5e55e6;hp=e9665caaccf14b1a1bc894b63e202c31c489c692;hpb=77733865782a76d067540b70304ff3dab7a1ab8c;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index e9665caac..3cf205364 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -131,7 +131,7 @@ sub send {
   }
 
   my $headers = '';
-  foreach my $item (qw(from to cc)) {
+  foreach my $item (qw(from to cc bcc)) {
     next unless ($self->{$item});
     my (@addr_objects) = Email::Address->parse($self->{$item});
     next unless (scalar @addr_objects);
@@ -193,8 +193,15 @@ $self->{message}
         return "$attachment : $!";
       }
 
+      # only set charset for attachements of type text. every other type should not have this field
+      # refer to bug 883 for detailed information
+      my $attachment_charset;
+      if (lc $application eq 'text' && $self->{charset}) {
+        $attachment_charset = qq|; charset="$self->{charset}" |;
+      }
+
       print OUT qq|--${boundary}
-Content-Type: $application/$self->{format}; name="$filename"; charset="$self->{charset}"
+Content-Type: $application/$self->{format}; name="$filename"$attachment_charset
 Content-Transfer-Encoding: BASE64
 Content-Disposition: attachment; filename="$filename"\n\n|;