From 3b1fffdf229f55b9c9c8013750339b72c9bacc5e Mon Sep 17 00:00:00 2001
From: David Goodwin <david@codepoets.co.uk>
Date: Tue, 3 Mar 2020 09:52:25 +0000
Subject: [PATCH] merge in patch from @jackdeguest - see
 https://github.com/postfixadmin/postfixadmin/issues/337

---
 VIRTUAL_VACATION/vacation.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/VIRTUAL_VACATION/vacation.pl b/VIRTUAL_VACATION/vacation.pl
index fd072182..293bc95e 100644
--- a/VIRTUAL_VACATION/vacation.pl
+++ b/VIRTUAL_VACATION/vacation.pl
@@ -212,6 +212,7 @@ if ($db_type eq 'mysql') {
     $db_true = '1';
 } else { # Pg
     $dbh->do("SET CLIENT_ENCODING TO 'UTF8'");
+    $dbh->{pg_enable_utf8} = 1;
     $db_true = 'True';
 }
 
@@ -437,8 +438,9 @@ sub send_vacation_email {
         }
 
         $logger->debug("Will send vacation response for $orig_messageid: FROM: $email (orig_to: $orig_to), TO: $orig_from; VACATION SUBJECT: $row[0] ; VACATION BODY: $row[1]");
-
+	
         my $subject = $row[0];
+	$subject = Encode::decode_utf8( $subject ) if( !Encode::is_utf8( $subject ) );
         $orig_subject = decode("mime-header", $orig_subject);
         $subject =~ s/\$SUBJECT/$orig_subject/g;
         if ($subject ne $row[0]) {
@@ -446,6 +448,7 @@ sub send_vacation_email {
         }
 
         my $body = $row[1];
+	$body = Encode::decode_utf8( $body ) if( !Encode::is_utf8( $body ) );
         my $from = $email;
         my $to = $orig_from;
 
@@ -483,6 +486,8 @@ sub send_vacation_email {
 
         my $transport = Email::Sender::Transport::SMTP->new($smtp_params);
 
+	$subject = Encode::encode_utf8( $subject ) if( Encode::is_utf8( $subject ) );
+	$body = Encode::encode_utf8( $body ) if( Encode::is_utf8( $body ) );
         $email = Email::Simple->create(
             header => [
                 To      => $to,