1 files changed, 3 insertions, 3 deletions
diff --git a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
index 09b8b9d..d0d2b3c 100644
--- a/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
+++ b/lib/JWebmail/Model/ReadMails/QMailAuthuser.pm
@@ -31,7 +31,7 @@ package JWebmail::Model::ReadMails::QMailAuthuser::Error {
         $self->{data} = $_[0] if @_ == 1;
         $self->{data} = [@_] if @_ > 1;
 
-        return bless $self;
+        return bless $self, $cls;
     }
 
     sub to_string {
@@ -169,7 +169,7 @@ sub build_arg {
 
     return $self->{qmail_dir}.'/bin/qmail-authuser'
     . $self->{prefix} . ' '
-    . join(' ', map { s/(['\\])/\\$1/g; "'$_'" } ($self->{prog}, $self->{maildir}, $self->{user}, $user_name, $mode, @$args))
+    . join(' ', map { my $x = s/(['\\])/\\$1/gr; "'$x'" } ($self->{prog}, $self->{maildir}, $self->{user}, $user_name, $mode, @$args))
     . ' 3<&0'
     . ' 2>>'.$self->{logfile};
 }
@@ -188,7 +188,7 @@ sub execute {
     close $writer
         or die 'closing write pipe failed';
 
-    binmode $reader, ':utf8';
+    binmode $reader, ':encoding(UTF-8)';
     my $input = <$reader>;
     close $reader
         or die 'closing read pipe failed';