diff --git a/Koha/Email.pm b/Koha/Email.pm
index 9c077a6b84..73f7da54a8 100644
--- a/Koha/Email.pm
+++ b/Koha/Email.pm
@@ -173,6 +173,11 @@ sub send_or_die {
         $args->{to} = \@recipients;
     }
 
+    unless ( $args->{from} ) {    # don't do it if passed an explicit 'from' param
+        $args->{from} = $self->email->header_str('Sender');
+        $self->email->header_str_set('Sender'); # remove Sender header
+    }
+
     $self->SUPER::send_or_die($args);
 }