Body encoding adjustments

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1775 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 3 insertions, 1 deletions

diff --git a/LedgerSMB/Mailer.pm b/LedgerSMB/Mailer.pm
index 0266d4b3..c7225480 100755
--- a/LedgerSMB/Mailer.pm
+++ b/LedgerSMB/Mailer.pm
@@ -72,7 +72,8 @@ sub send {
         'Bcc'     => $self->{bcc},
         'Subject' => Encode::encode('MIME-Header', $self->{subject}),
         'Type'    => 'TEXT',
-        'Data'    => $self->{message},
+	'Data'    => Encode::encode_utf8($self->{message}),
+	'Encoding' => '8bit',
         'Message-ID' => $msg_id,
     );
     $msg->attr("Content-Type" => $self->{contenttype});
@@ -81,6 +82,7 @@ sub send {
     $msg->add( 'Disposition-Notification-To' => $self->{from} )
       if $self->{notify};
     $msg->replace( 'X-Mailer' => "LedgerSMB $self->{version}" );
+    $msg->binmode(':utf8');
 
     if ( @{ $self->{attachments} } ) {
         foreach my $attachment ( @{ $self->{attachments} } ) {