diff --git a/opac/opac-issue-note.pl b/opac/opac-issue-note.pl
index 376a32c9a1..86c6d675f6 100755
--- a/opac/opac-issue-note.pl
+++ b/opac/opac-issue-note.pl
@@ -79,7 +79,17 @@ if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) {
                     'borrowers' => $borrowernumber,
                 },
             );
-            C4::Message->enqueue($letter, $patron->unblessed, 'email');
+
+            my $to_address = $branch->branchemail || $branch->branchreplyto || C4::Context->ReplytoDefault || C4::Context->preference('KohaAdminEmailAddress');
+            my $from_address = $patron->email || $patron->emailpro || $patron->B_email;
+
+            C4::Letters::EnqueueLetter({
+                letter => $letter,
+                message_transport_type => 'email',
+                borrowernumber => $patron->borrowernumber,
+                to_address => $to_address,
+                from_address => $from_address,
+            });
         }
     }
     print $query->redirect("/cgi-bin/koha/opac-user.pl");
diff --git a/opac/svc/patron_notes b/opac/svc/patron_notes
index 6110cf1bd6..a8ab7b10ff 100755
--- a/opac/svc/patron_notes
+++ b/opac/svc/patron_notes
@@ -89,7 +89,17 @@ if ($is_ajax) {
                         'borrowers' => $borrowernumber,
                     },
                 );
-                C4::Message->enqueue($letter, $patron->unblessed, 'email');
+
+                my $to_address = $branch->branchemail || $branch->branchreplyto || C4::Context->ReplytoDefault || C4::Context->preference('KohaAdminEmailAddress');
+                my $from_address = $patron->email || $patron->emailpro || $patron->B_email;
+
+                C4::Letters::EnqueueLetter({
+                    letter => $letter,
+                    message_transport_type => 'email',
+                    borrowernumber => $patron->borrowernumber,
+                    to_address => $to_address,
+                    from_address => $from_address,
+                });
             } else { # note empty, i.e removed
                 $status = "removed";
             }