set Sender: like From: to avoid Outlook drain bramage, RT#20825

1 files changed, 12 insertions, 6 deletions

diff --git a/rt/lib/RT/Action/SendEmail.pm b/rt/lib/RT/Action/SendEmail.pm
index 189b999a8..da9930c50 100755
--- a/rt/lib/RT/Action/SendEmail.pm
+++ b/rt/lib/RT/Action/SendEmail.pm
@@ -851,6 +851,9 @@ sub SetReturnAddress {
     }
 
     unless ( $self->TemplateObj->MIMEObj->head->get('From') ) {
+
+        my $from = $replyto;
+
         if ( RT->Config->Get('UseFriendlyFromLine') ) {
             my $friendly_name = $args{friendly_name};
 
@@ -862,19 +865,22 @@ sub SetReturnAddress {
             }
 
             $friendly_name =~ s/"/\\"/g;
-            $self->SetHeader(
-                'From',
+            $from =
                 sprintf(
                     RT->Config->Get('FriendlyFromLineFormat'),
                     $self->MIMEEncodeString(
                         $friendly_name, RT->Config->Get('EmailOutputEncoding')
                     ),
                     $replyto
-                ),
-            );
-        } else {
-            $self->SetHeader( 'From', $replyto );
+                );
         }
+
+        $self->SetHeader( 'From', $from );
+
+        #also set Sender:, otherwise MTAs add a nonsensical value like
+        # rt@machine, and then Outlook prepends "rt@machine on behalf of" to
+        # the From: header
+        $self->SetHeader( 'Sender', $from );
     }
 
     unless ( $self->TemplateObj->MIMEObj->head->get('Reply-To') ) {