diff --git a/Koha/Recall.pm b/Koha/Recall.pm
index 6f3678f691..a060a5bf3a 100644
--- a/Koha/Recall.pm
+++ b/Koha/Recall.pm
@@ -358,7 +358,11 @@ sub set_waiting {
         },
     );
 
-    C4::Message->enqueue($letter, $self->patron, 'email');
+    my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences(
+        { borrowernumber => $self->patron_id, message_name => 'Recall_Waiting' } );
+    while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ) {
+        C4::Message->enqueue( $letter, $self->patron, $transport );
+    }
 
     return $self;
 }
diff --git a/Koha/Recalls.pm b/Koha/Recalls.pm
index 29be68ce05..9f6d14e364 100644
--- a/Koha/Recalls.pm
+++ b/Koha/Recalls.pm
@@ -167,7 +167,12 @@ sub add_recall {
             },
         );
 
-        C4::Message->enqueue( $letter, $checkout->patron, 'email' );
+        my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences(
+            { borrowernumber => $checkout->borrowernumber, message_name => 'Recall_Requested' } );
+
+        while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ) {
+            C4::Message->enqueue( $letter, $checkout->patron, $transport );
+        }
 
         $item = Koha::Items->find( $itemnumber );
         # add to statistics table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index 6e08c2ee16..b3cadaa435 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -18,6 +18,7 @@
     [% FOREACH messaging_preference IN messaging_preferences %]
     [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
     [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
+    [% NEXT IF !Koha.Preference('UseRecalls') && messaging_preference.message_name.match('^Recall_') %]
     <tr id="[% messaging_preference.message_name _ "_message" | lower | html %]">
       <td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>
           [% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>
@@ -34,6 +35,8 @@
           [% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>
           [% ELSIF ( messaging_preference.Ill_update ) %]<span>Interlibrary loan updated</span>
           [% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>
+          [% ELSIF ( messaging_preference.Recall_Waiting ) %]<span>Recall awaiting pickup</span>
+          [% ELSIF ( messaging_preference.Recall_Requested ) %]<span>Return recalled item</span>
           [% ELSE %]<span>Unknown</span>
           [% END %]
       </td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index 5026b17dd5..4a34272063 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -60,6 +60,7 @@
                                     [% FOREACH messaging_preference IN messaging_preferences %]
                                         [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %]
                                         [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %]
+                                        [% NEXT IF !Koha.Preference('UseRecalls') && messaging_preference.message_name.match('^Recall_') %]
                                         <tr id="[% messaging_preference.message_name _ "_message" | lower | html %]">
                                             <td>[% IF ( messaging_preference.Item_Due ) %]<span>Item due</span>
                                                 [% ELSIF ( messaging_preference.Advance_Notice ) %]<span>Advance notice</span>
@@ -76,6 +77,8 @@
                                                 [% ELSIF ( messaging_preference.Ill_unavailable ) %]<span>Interlibrary loan unavailable</span>
                                                 [% ELSIF ( messaging_preference.Ill_update ) %]<span>Interlibrary loan updated</span>
                                                 [% ELSIF ( messaging_preference.Auto_Renewals ) %]<span>Auto renewal</span>
+                                                [% ELSIF ( messaging_preference.Recall_Waiting ) %]<span>Recall awaiting pickup</span>
+                                                [% ELSIF ( messaging_preference.Recall_Requested ) %]<span>Return recalled item</span>
                                                 [% ELSE %]<span>Unknown</span> [% END %]</td>
                                             [% IF ( messaging_preference.takes_days ) %]
                                                 <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS" aria-label="Choose how many days in advance you wish to receive the message">