-
- my $branch_email = ( $member ) ? GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} : undef;
-
- my %sendmail_params = (
- To => $to_address,
- From => $message->{'from_address'} || $branch_email || C4::Context->preference('KohaAdminEmailAddress'),
- Subject => $subject,
- charset => 'utf8',
- Message => $is_html ? _wrap_html($content, $subject) : $content,
- 'content-type' => $content_type,
+ my $branch_email = undef;
+ my $branch_replyto = undef;
+ my $branch_returnpath = undef;
+ if ($member){
+ my $branchdetail = GetBranchDetail( $member->{'branchcode'} );
+ $branch_email = $branchdetail->{'branchemail'};
+ $branch_replyto = $branchdetail->{'branchreplyto'};
+ $branch_returnpath = $branchdetail->{'branchreturnpath'};
+ }
+ my $email = Koha::Email->new();
+ my %sendmail_params = $email->create_message_headers(
+ {
+ to => $to_address,
+ from => $message->{'from_address'} || $branch_email,
+ replyto => $branch_replyto,
+ sender => $branch_returnpath,
+ subject => $subject,
+ message => $is_html ? _wrap_html( $content, $subject ) : $content,
+ contenttype => $content_type
+ }