X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FAction%2FAutoreply.pm;h=81f7bddfad30b54befed3e0918f3de984a8eed82;hb=35effa1bf4ac902547615c816960bbc8db8e7256;hp=f58b8f284729650ec3776a8278d205b458541808;hpb=289340780927b5bac2c7604d7317c3063c6dd8cc;p=freeside.git

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