import of rt 3.0.9RT_3_0_9

1 files changed, 12 insertions, 4 deletions

diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
index 81f7bddfa..f58b8f284 100755
--- a/rt/lib/RT/Action/Autoreply.pm
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -74,10 +74,18 @@ sub SetReturnAddress {
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('From')) {
-	my $friendly_name = $self->TicketObj->QueueObj->Description ||
-		$self->TicketObj->QueueObj->Name;
-	$friendly_name =~ s/"/\\"/g;
-	$self->SetHeader('From', "\"$friendly_name\" <$replyto>");
+	if ($RT::UseFriendlyFromLine) {
+	    my $friendly_name = $self->TicketObj->QueueObj->Description ||
+		    $self->TicketObj->QueueObj->Name;
+	    $friendly_name =~ s/"/\\"/g;
+	    $self->SetHeader( 'From',
+		        sprintf($RT::FriendlyFromLineFormat, 
+                $self->MIMEEncodeString( $friendly_name, $RT::EmailOutputEncoding ), $replyto),
+	    );
+	}
+	else {
+	    $self->SetHeader( 'From', $replyto );
+	}
     }
     
     unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {