OverrideOutgoingMailFrom: Use $CorrespondAddress if the queue's isn't…

… set

Otherwise the meaning of the Default key changes depending on the
queue's correspond address being set or not.  Using the global
correspond address for queues with no specific correspond address, as
well as moving the Default check into the else branch, means the Default
key is only used when there's no ticket involved.  This is the
documented behaviour in RT_Config.pm.

lib/RT/Interface/Email.pm

@@ -420,12 +420,13 @@ sub SendEmail {
                 if ($QueueAddressOverride) {
                     $OutgoingMailAddress = $QueueAddressOverride;
                 } else {
-                    $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress;
+                    $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress
+                                           || RT->Config->Get('CorrespondAddress');
                 }
+            } else {
+                $OutgoingMailAddress ||= RT->Config->Get('OverrideOutgoingMailFrom')->{'Default'};
             }
 
-            $OutgoingMailAddress ||= RT->Config->Get('OverrideOutgoingMailFrom')->{'Default'};
-
             push @args, "-f", $OutgoingMailAddress
                 if $OutgoingMailAddress;
         }