Cutthrough: option to use transport-defined mailfrom. Bug 3071

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 8edf7d0020af373edd9d36daf91cf0c375c3e58e..1cf4562d2ac2aec13e726ab1b868041b0e7bb09e 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -32206,16 +32206,16 @@ is what is wanted for subsequent tests.
 .vitem &*control&~=&~cutthrough_delivery/*&<&'options'&>
 .cindex "&ACL;" "cutthrough routing"
 .cindex "cutthrough" "requesting"
-This option requests delivery be attempted while the item is being received.
+This control requests delivery be attempted while the item is being received.
 
-The option is usable in the RCPT ACL.
+The control is usable in the RCPT ACL.
 If enabled for a message received via smtp and routed to an smtp transport,
 and only one transport, interface, destination host and port combination
 is used for all recipients of the message,
 then the delivery connection is made while the receiving connection is open
 and data is copied from one to the other.
 
-An attempt to set this option for any recipient but the first
+An attempt to set this control for any recipient but the first
 for a mail will be quietly ignored.
 If a recipient-verify callout
 (with use_sender)
@@ -32242,9 +32242,8 @@ message body.
 Cutthrough delivery is not supported via transport-filters or when DKIM signing
 of outgoing messages is done, because it sends data to the ultimate destination
 before the entire message has been received from the source.
-It is not supported for messages received with the SMTP PRDR
-or CHUNKING
-options in use.
+It is not supported for messages received with the SMTP PRDR or CHUNKING
+modes in use.
 
 Should the ultimate destination system positively accept or reject the mail,
 a corresponding indication is given to the source system and nothing is queued.
@@ -32252,18 +32251,32 @@ If the item is successfully delivered in cutthrough mode
 the delivery log lines are tagged with ">>" rather than "=>" and appear
 before the acceptance "<=" line.
 
-If there is a temporary error the item is queued for later delivery in the
-usual fashion.
-This behaviour can be adjusted by appending the option &*defer=*&<&'value'&>
-to the control; the default value is &"spool"& and the alternate value
-&"pass"& copies an SMTP defer response from the target back to the initiator
-and does not queue the message.
-Note that this is independent of any recipient verify conditions in the ACL.
-
 Delivery in this mode avoids the generation of a bounce mail to a
 (possibly faked)
 sender when the destination system is doing content-scan based rejection.
 
+.new
+Options for this control may be appended, separated by slash (&"/"&)
+characters.
+There are two possible options,
+both taking a value string prefixed by an equals (&"="&) character.
+
+The &*defer*& option controls the result of a temporary error
+of the cutthrough delivery.
+The default value &"spool"& queues the message in the normal way
+for later processing.
+A value of &"pass"& copies an SMTP defer response back to the initiator
+and does not queue the message.
+Note that this is independent of any recipient verify conditions in the ACL.
+
+The &*sender*& option controls the envelope-from used for the
+outbound connection.
+The default value of &"orig"& uses the address given for envelope-from
+in the inbound (originating) connection.
+A value of &"transport"& permits the transport used for the outbound
+connection to modify the envelope-from, via its &*return_path*& option.
+.wen
+
 
 .vitem &*control&~=&~debug/*&<&'options'&>
 .cindex "&ACL;" "enabling debug logging"

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 30b41570f8106e9ebfb0186f9f716867700ac835..91e1aacf6542126a855a18149d365848f73997e4 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -30,6 +30,8 @@ Version 4.98
 
  9. IPv6 address support for mysql and pgsql lookups
 
+ 10. Cutthrough deliveries can use an envelope-from specified by a transport.
+
 Version 4.98
 ------------
  1. The dkim_status ACL condition may now be used in data ACLs

diff --git a/src/src/acl.c b/src/src/acl.c
index 882fddd3cd65d24c5c6d032574efbc7fbc3d239a..2e7dc2929272aef44ea25aa20aba091491553de1 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -3798,10 +3798,18 @@ for (; cb; cb = cb->next)
                {
                pp += 6;
                if (Ustrncmp(pp, "pass", 4) == 0) cutthrough.defer_pass = TRUE;
-               /* else if (Ustrncmp(pp, "spool") == 0) ;       default */
+               /* else if (Ustrncmp(pp, "spool", 5) == 0) ;    default */
                }
-             else
-               while (*pp && *pp != '/') pp++;
+             else if (Ustrncmp(pp, "sender=", 7) == 0)
+               {
+/*XXX rather raises the Q: should r-verify have a similar option?
+Esp. given the callout hold options and upgrade to cutthrough... */
+               pp += 7;
+               if (Ustrncmp(pp, "transport", 9) == 0)
+                 cutthrough.tpt_sender = TRUE;
+               /* else if (Ustrcmp(pp, "orig") == 0) ; default */
+               }
+             while (*pp && *pp != '/') pp++;
              p = pp;
              }
            }
@@ -5024,12 +5032,19 @@ switch (where)
     if (f.host_checking_callout)       /* -bhc mode */
       cancel_cutthrough_connection(TRUE, US"host-checking mode");
 
-    else if (  rc == OK
-           && cutthrough.delivery
-           && rcpt_count > cutthrough.nrcpt
-           )
-      {
-      if ((rc = open_cutthrough_connection(addr)) == DEFER)
+    else if (cutthrough.delivery)
+      if (rc != OK)
+       {
+       HDEBUG(D_acl) debug_printf_indent(
+                       "ignore cutthrough request; ACL did not accept\n");
+       }
+      else if (rcpt_count <= cutthrough.nrcpt)
+       {
+       HDEBUG(D_acl) debug_printf_indent(
+                       "ignore cutthrough request; nonfirst message\n");
+       }
+      else if (  (rc = open_cutthrough_connection(addr, cutthrough.tpt_sender))
+             == DEFER)
        if (cutthrough.defer_pass)
          {
          uschar * s = addr->message;
@@ -5044,12 +5059,7 @@ switch (where)
          HDEBUG(D_acl) debug_printf_indent("cutthrough defer; will spool\n");
          rc = OK;
          }
-      }
-    else HDEBUG(D_acl) if (cutthrough.delivery)
-      if (rcpt_count <= cutthrough.nrcpt)
-       debug_printf_indent("ignore cutthrough request; nonfirst message\n");
-      else if (rc != OK)
-       debug_printf_indent("ignore cutthrough request; ACL did not accept\n");
+
     break;
 
   case ACL_WHERE_PREDATA:

diff --git a/src/src/deliver.c b/src/src/deliver.c
index cbf5268c2f06d76c48508a34b7d82b656d166777..4878f383d3d3c0c66420a8adbe1e4b5adfd455f1 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -2143,18 +2143,16 @@ gid_t gid;
 int status, len, rc;
 int pfd[2];
 pid_t pid;
-uschar *working_directory;
-address_item *addr2;
+uschar * working_directory;
+address_item * addr2;
 transport_instance * tp = addr->transport;
 const uschar * trname = tp->drinst.name;
 
 /* Set up the return path from the errors or sender address. If the transport
 has its own return path setting, expand it and replace the existing value. */
 
-if(addr->prop.errors_address)
-  return_path = addr->prop.errors_address;
-else
-  return_path = sender_address;
+return_path = addr->prop.errors_address
+  ? addr->prop.errors_address : sender_address;
 
 GET_OPTION("return_path");
 if (tp->return_path)

diff --git a/src/src/functions.h b/src/src/functions.h
index ed33018b98c29b31c499c8f1c0c684c10d2c736b..ee6b1ff2d24e46ec448a5d2ac13af36135271c9b 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -364,7 +364,7 @@ extern void    moan_write_references(FILE *, uschar *);
 #endif
 extern FILE   *modefopen(const uschar *, const char *, mode_t);
 
-extern int     open_cutthrough_connection( address_item * addr );
+extern int     open_cutthrough_connection(address_item *, BOOL);
 
 extern uschar *parse_extract_address(const uschar *, uschar **, int *, int *, int *,
                  BOOL);

diff --git a/src/src/globals.c b/src/src/globals.c
index ca2979d40724e3151b90c17c81ac8352f78cbe5e..0bbc9aaefb000dc6c02f80272c265dcc893cedfc 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -764,6 +764,7 @@ uschar *csa_status             = NULL;
 cut_t   cutthrough = {
   .callout_hold_only = FALSE,                          /* verify-only: normal delivery */
   .delivery =          FALSE,                          /* when to attempt */
+  .tpt_sender =                FALSE,                          /* use tpt's sender */
   .defer_pass =                FALSE,                          /* on defer: spool locally */
   .is_tls =            FALSE,                          /* not a TLS conn yet */
   .cctx =              {.sock = -1},                   /* open connection */

diff --git a/src/src/globals.h b/src/src/globals.h
index 3f1ae259acc82788b6462ef1a5b66e4f077d789d..cb312308bf0bc1c71b4ac013faa5057f2f5813dd 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -472,6 +472,7 @@ extern uschar *csa_status;             /* Client SMTP Authorization result */
 typedef struct {
   unsigned     callout_hold_only:1;    /* Conn is only for verify callout */
   unsigned     delivery:1;             /* When to attempt */
+  unsigned     tpt_sender:1;           /* Use tpt-defined sender */
   unsigned     defer_pass:1;           /* Pass 4xx to caller rather than spooling */
   unsigned     is_tls:1;              /* Conn has TLS active */
   client_conn_ctx cctx;                /* Open connection */

diff --git a/src/src/macros.h b/src/src/macros.h
index a3c8b81f841d3438181a8d717fde7dc114b1d4fe..3ac9315c579f352557e6fcdfc2aa4b701f7af85f 100644 (file)
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -742,10 +742,11 @@ enum { v_none, v_sender, v_recipient, v_expn };
 #define vopt_callout_no_cache     0x0040   /* disable callout cache */
 #define vopt_callout_recipsender  0x0080   /* use real sender to verify recip */
 #define vopt_callout_recippmaster 0x0100   /* use postmaster to verify recip */
-#define vopt_callout_hold        0x0200   /* lazy close connection */
-#define vopt_success_on_redirect  0x0400
-#define vopt_quota                0x0800   /* quota check, to local/appendfile */
-#define vopt_atrn                0x1000   /* ATRN customer mode */
+#define vopt_callout_r_tptsender  0x0200   /* use s from tpt to verify recip */
+#define vopt_callout_hold        0x0400   /* lazy close connection */
+#define vopt_success_on_redirect  0x0800
+#define vopt_quota                0x1000   /* quota check, to local/appendfile */
+#define vopt_atrn                0x2000   /* ATRN customer mode */
 
 /* Values for fields in callout cache records */
 

diff --git a/src/src/receive.c b/src/src/receive.c
index 02a1f96e250e835afe51a991d93742969b9c4904..11b583269b3a0d11d8f15879d0497b1840f96236 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -4329,7 +4329,7 @@ for this message. */
 
    XXX We do not handle queue-only, freezing, or blackholes.
 */
-if(cutthrough.cctx.sock >= 0 && cutthrough.delivery)
+if (cutthrough.cctx.sock >= 0 && cutthrough.delivery)
   {
   uschar * msg = cutthrough_finaldot();        /* Ask the target system to accept the message */
                                        /* Logging was done in finaldot() */

diff --git a/src/src/route.c b/src/src/route.c
index a54a7e84d29d3d189a9855f9ff684a0de8714f92..f6e0e33d0e9410176a2c255baf702b164f44ab75 100644 (file)
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -2081,12 +2081,12 @@ HDEBUG(D_route) debug_printf("routed by %s router%s\n", rname_l,
 
 DEBUG(D_route)
   {
-  debug_printf("  envelope to: %s\n", addr->address);
-  debug_printf("  transport: %s\n", addr->transport
+  debug_printf("  envelope to:\t%s\n", addr->address);
+  debug_printf("  transport:\t%s\n", addr->transport
     ? addr->transport->drinst.name : US"<none>");
 
   if (addr->prop.errors_address)
-    debug_printf("  errors to %s\n", addr->prop.errors_address);
+    debug_printf("  errors to:\t%s\n", addr->prop.errors_address);
 
   for (host_item * h = addr->host_list; h; h = h->next)
     {

diff --git a/src/src/verify.c b/src/src/verify.c
index 08c3deb5113b544304b6fd898b09082a0e31d338..c69dc193d2102d46f2edb5ec592bb6b2bcb60b5b 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -389,6 +389,10 @@ if (addr->transport == cutthrough.addr.transport)
        uschar * resp = NULL;
 
        /* Match!  Send the RCPT TO, set done from the response */
+
+       DEBUG(D_verify)
+         debug_printf("already-open verify connection matches recipient\n");
+
        done =
             smtp_write_command(&ctctx, SCMD_FLUSH, "RCPT TO:<%.1000s>\r\n",
              transport_rcpt_address(addr,
@@ -486,8 +490,9 @@ Arguments:
                       vopt_callout_no_cache => don't use callout cache
                       vopt_callout_fullpm => if postmaster check, do full one
                       vopt_callout_random => do the "random" thing
-                      vopt_callout_recipsender => use real sender for recipient
-                      vopt_callout_recippmaster => use postmaster for recipient
+                      vopt_callout_recipsender => use original sender addres
+                      vopt_callout_recippmaster => use postmaster as sender
+vopt_callout_r_tptsender => use sender as defined by transport
                      vopt_callout_hold         => lazy close connection
   se_mailfrom         MAIL FROM address for sender verify; NULL => ""
   pm_mailfrom         if non-NULL, do the postmaster check with this sender
@@ -520,26 +525,47 @@ new_domain_record.random_result = ccache_unknown;
 memset(&new_address_record, 0, sizeof(new_address_record));
 
 /* For a recipient callout, the key used for the address cache record must
-include the sender address if we are using the real sender in the callout,
-because that may influence the result of the callout. */
+include the sender address if we are using anything but a blank sender in the
+callout, because that may influence the result of the callout. */
 
 if (options & vopt_is_recipient)
-  if (options & vopt_callout_recipsender)
+  if (options & ( vopt_callout_recipsender
+               | vopt_callout_r_tptsender
+               | vopt_callout_recippmaster)
+     )
     {
-    from_address = sender_address;
-    address_key = string_sprintf("%s/<%s>", addr->address, sender_address);
+    if (options & vopt_callout_recipsender)
+      from_address = sender_address;
+    else if (options & vopt_callout_r_tptsender)
+      {
+      transport_instance * tp = addr->transport;
+      from_address = addr->prop.errors_address
+                 ? addr->prop.errors_address : sender_address;
+      DEBUG(D_verify)
+       debug_printf(" return-path from routed addr: %s\n", from_address);
+
+      GET_OPTION("return_path");
+      if (tp->return_path)
+       {
+       uschar * new_return_path = expand_string(tp->return_path);
+       if (new_return_path)
+         from_address = new_return_path;
+       else if (!f.expand_string_forcedfail)
+         return DEFER;
+       DEBUG(D_verify)
+         debug_printf(" return-path from transport: %s\n", from_address);
+       }
+      }
+    else /* if (options & vopt_callout_recippmaster) */
+      from_address = string_sprintf("postmaster@%s", qualify_domain_sender);
+
+    address_key = string_sprintf("%s/<%s>", addr->address, from_address);
     if (cutthrough.delivery)                   /* cutthrough previously req. */
       {
       options |= vopt_callout_no_cache;                /* in case called by verify= */
       addr->return_path = from_address;                /* for cutthrough logging */
       }
     }
-  else if (options & vopt_callout_recippmaster)
-    {
-    from_address = string_sprintf("postmaster@%s", qualify_domain_sender);
-    address_key = string_sprintf("%s/<postmaster@%s>", addr->address,
-      qualify_domain_sender);
-    }
   else
     {
     from_address = US"";
@@ -621,7 +647,8 @@ coding means skipping this whole loop and doing the append separately.  */
 
   /* Can we re-use an open cutthrough connection? */
   if (  cutthrough.cctx.sock >= 0
-     && (options & (vopt_callout_recipsender | vopt_callout_recippmaster))
+     && (options & ( vopt_callout_recipsender
+                  | vopt_callout_r_tptsender | vopt_callout_recippmaster))
        == vopt_callout_recipsender
      && !random_local_part
      && !pm_mailfrom
@@ -1114,8 +1141,7 @@ no_conn:
        && rcpt_count == 1
        && done
        && yield == OK
-       &&    (options & (vopt_callout_recipsender|vopt_callout_recippmaster|vopt_success_on_redirect))
-          == vopt_callout_recipsender
+       && !(options & (vopt_callout_recippmaster | vopt_success_on_redirect))
        && !random_local_part
        && !pm_mailfrom
        && cutthrough.cctx.sock < 0
@@ -1163,7 +1189,7 @@ no_conn:
     else
       {
       /* Ensure no cutthrough on multiple verifies that were incompatible */
-      if (options & vopt_callout_recipsender)
+      if (options & (vopt_callout_recipsender | vopt_callout_r_tptsender))
         cancel_cutthrough_connection(TRUE, US"not usable for cutthrough");
       if (sx->send_quit && sx->cctx.sock >= 0)
        if (smtp_write_command(sx, SCMD_FLUSH, "QUIT\r\n") != -1)
@@ -1248,10 +1274,10 @@ return yield;
    one was requested and a recipient-verify wasn't subsequently done.
 */
 int
-open_cutthrough_connection(address_item * addr)
+open_cutthrough_connection(address_item * addr, BOOL transport_sender)
 {
 address_item addr2;
-int rc;
+int vopt, rc;
 
 /* Use a recipient-verify-callout to set up the cutthrough connection. */
 /* We must use a copy of the address for verification, because it might
@@ -1260,9 +1286,12 @@ get rewritten. */
 addr2 = *addr;
 HDEBUG(D_acl) debug_printf_indent("----------- %s cutthrough setup ------------\n",
   rcpt_count > 1 ? "more" : "start");
-rc = verify_address(&addr2, NULL,
-       vopt_is_recipient | vopt_callout_recipsender | vopt_callout_no_cache,
-       CUTTHROUGH_CMD_TIMEOUT, -1, -1,
+
+vopt = transport_sender
+  ? vopt_is_recipient | vopt_callout_r_tptsender | vopt_callout_no_cache
+  : vopt_is_recipient | vopt_callout_recipsender | vopt_callout_no_cache;
+
+rc = verify_address(&addr2, NULL, vopt, CUTTHROUGH_CMD_TIMEOUT, -1, -1,
        NULL, NULL, NULL);
 addr->message = addr2.message;
 addr->user_message = addr2.user_message;
@@ -1678,6 +1707,7 @@ Arguments:
                      vopt_callout_random => do the "random" thing
                      vopt_callout_recipsender => use real sender for recipient
                      vopt_callout_recippmaster => use postmaster for recipient
+vopt_callout_r_tptsender => use sender as defined by transport
 
   callout          if > 0, specifies that callout is required, and gives timeout
                      for individual commands
@@ -1994,7 +2024,8 @@ while (addr_new)
 
       if (host_list)
         {
-        HDEBUG(D_verify) debug_printf("Attempting full verification using callout\n");
+        HDEBUG(D_verify)
+         debug_printf("Attempting full verification using callout\n");
         if (host_checking && !f.host_checking_callout)
           {
           HDEBUG(D_verify)
@@ -2003,14 +2034,11 @@ while (addr_new)
           }
         else
           {
-#ifndef DISABLE_TLS
          deliver_set_expansions(addr);
-#endif
           rc = do_callout(addr, host_list, &tf, callout, callout_overall,
             callout_connect, options, se_mailfrom, pm_mailfrom);
-#ifndef DISABLE_TLS
          deliver_set_expansions(NULL);
-#endif
+
          if (  options & vopt_is_recipient
             && rc == OK
                         /* set to "random", with OK, for an accepted random */
@@ -2212,7 +2240,7 @@ if (allok && !addr_local && !addr_remote)
 for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
   while (addr_list)
     {
-    address_item *addr = addr_list;
+    address_item * addr = addr_list;
     transport_instance * tp = addr->transport;
 
     addr_list = addr->next;

diff --git a/test/confs/5400 b/test/confs/5400
index 1906e819d57e32fc6b86f92038672ae040003542..082091fd63d56a3d3b57a2be58ea25fd4c2e0569 100644 (file)
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -6,6 +6,9 @@ CONTROL=
 # optional verify-callout
 OPT=
 
+# return_path on transport
+RETURN=
+
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
@@ -62,16 +65,17 @@ all:
 begin transports
 
 smtp:
-  driver = smtp
-  interface = HOSTIPV4
-  port = PORT_S
+  driver =     smtp
+  interface =  HOSTIPV4
+  port =       PORT_S
   hosts_try_fastopen = :
-  headers_add =  ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
+  headers_add =        ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}}
+  return_path =        RETURN
 
 smtp2:
-  driver = smtp
-  interface = HOSTIPV4
-  port = PORT_S
+  driver =     smtp
+  interface =  HOSTIPV4
+  port =       PORT_S
   hosts_try_fastopen = :
 
 

diff --git a/test/log/5400 b/test/log/5400
index 43873a6806b4cde7c375fbadaa2cad8a6614b9ee..cfb35dd8e8a9628e20e0c669627a7b715b2e9f4e 100644 (file)
--- a/test/log/5400
+++ b/test/log/5400
@@ -57,3 +57,7 @@
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 >> userx@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 Completed
+1999-03-02 09:44:33 rcpt for userx@domain.com
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 >> userx@domain.com P=<return_path_changed@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 Completed

diff --git a/test/log/5404 b/test/log/5404
index f5933167b60df6706b787e7e19d2fb464d4c5d93..f2a45bc35089e7c8bcb6842148d8e00a4d553fdd 100644 (file)
--- a/test/log/5404
+++ b/test/log/5404
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 rcpt for userx@domain.com
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> userx@domain.com P=<fred@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed

diff --git a/test/log/5405 b/test/log/5405
index 5b608cb39ff143f0185cf50a43c6482fd71e1f47..b8476618b60bb7b87a02b2817bc5e1bd09c19d78 100644 (file)
--- a/test/log/5405
+++ b/test/log/5405
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 rcpt for usera@domain.com
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> usera@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> usera@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for usera@domain.com
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 1999-03-02 09:44:33 rcpt for userb@domain.com
@@ -9,16 +9,16 @@
 1999-03-02 09:44:33 rcpt for userd@domain.com
 1999-03-02 09:44:33 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected RCPT <userd@domain.com>
 1999-03-02 09:44:33 rcpt for usere@domain.com
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER usere@domain.com F=<CALLER@myhost.test.ex> tmp-reject from cutthrough after DATA: R=all T=smtp H=127.0.0.1 [127.0.0.1] C="459 content reject"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER usere@domain.com F=<CALLER@myhost.test.ex> P=<CALLER@myhost.test.ex> tmp-reject from cutthrough after DATA: R=all T=smtp H=127.0.0.1 [127.0.0.1] C="459 content reject"
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for usere@domain.com
 1999-03-02 09:44:33 rcpt for userf@domain.com
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER userf@domain.com F=<CALLER@myhost.test.ex> tmp-reject from cutthrough after DATA: R=all T=smtp H=127.0.0.1 [127.0.0.1] C="459 content reject"
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER userf@domain.com F=<CALLER@myhost.test.ex> P=<CALLER@myhost.test.ex> tmp-reject from cutthrough after DATA: R=all T=smtp H=127.0.0.1 [127.0.0.1] C="459 content reject"
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userf@domain.com
 1999-03-02 09:44:33 rcpt for userg@domain.com
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER userg@domain.com F=<CALLER@myhost.test.ex> tmp-reject from cutthrough after DATA: R=all T=smtp H=127.0.0.1 [127.0.0.1] C="459 content reject"
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER userg@domain.com F=<CALLER@myhost.test.ex> P=<CALLER@myhost.test.ex> tmp-reject from cutthrough after DATA: R=all T=smtp H=127.0.0.1 [127.0.0.1] C="459 content reject"
 1999-03-02 09:44:33 rcpt for userj@domain.com
 1999-03-02 09:44:33 rcpt for userh@domain.com
-1999-03-02 09:44:33 10HmbD-000000005vi-0000 >> userh@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 >> userh@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userh@domain.com
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed
 1999-03-02 09:44:33 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected RCPT <useri@domain.com>: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<useri@domain.com>: 450 not right now

diff --git a/test/log/5406 b/test/log/5406
index b0e4b9308a9b46c8673be5abcc79d10c75caa256..de4aa3f7c4a330c64952431ada39250f89045ce9 100644 (file)
--- a/test/log/5406
+++ b/test/log/5406
@@ -1,18 +1,18 @@
 1999-03-02 09:44:33 rcpt for userx@domain.com
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> userx@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 1999-03-02 09:44:33 rcpt for usery@domain.com
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 >> usery@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for usery@domain.com
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
 1999-03-02 09:44:33 rcpt for userx@domain.com
-1999-03-02 09:44:33 10HmaZ-000000005vi-0000 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 >> userx@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
 1999-03-02 09:44:33 rcpt for usery@domain.com
 1999-03-02 09:44:33 rcpt for userz@domain.com
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 >> userz@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 >> userz@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 >> usery@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for usery@domain.com userz@domain.com
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed

diff --git a/test/log/5408 b/test/log/5408
index 51ac96fbfb277e3838c6f1e5d47f73a076f2501c..3709ef448c1ba800017159fc78323da31d66a75c 100644 (file)
--- a/test/log/5408
+++ b/test/log/5408
@@ -1,17 +1,17 @@
 **NOTE: The delivery lines in this file have been sorted.
 1999-03-02 09:44:33 rcpt for userx@domain.com
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 >> userx@domain.com P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@domain.com
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 1999-03-02 09:44:33 rcpt for ruserx@domain.com
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 >> userx@domain.com <ruserx@domain.com> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 >> userx@domain.com <ruserx@domain.com> P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for ruserx@domain.com
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
 1999-03-02 09:44:33 rcpt for rruserx@domain.com
-1999-03-02 09:44:33 10HmaZ-000000005vi-0000 >> userx@domain.com (ruserx@domain.com) <rruserx@domain.com> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 >> userx@domain.com (ruserx@domain.com) <rruserx@domain.com> P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for rruserx@domain.com
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
 1999-03-02 09:44:33 rcpt for rrruserx@domain.com
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 >> userx@domain.com (ruserx@domain.com, rruserx@domain.com) <rrruserx@domain.com> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 >> userx@domain.com (ruserx@domain.com, rruserx@domain.com) <rrruserx@domain.com> P=<CALLER@myhost.test.ex> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for rrruserx@domain.com
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed

diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400
index 10406c2557220c20a76e21a1e99be65d8d244a57..02daabf828ca5f1d3870b2d8a7c9b0c7bcd8ab1a 100644 (file)
--- a/test/scripts/5400-cutthrough/5400
+++ b/test/scripts/5400-cutthrough/5400
@@ -443,5 +443,35 @@ QUIT
 ****
 #
 #
+# Return_path option on the transport
+server PORT_S
+220 ESMTP
+EHLO
+250 OK
+MAIL FROM:<return_path_changed@myhost.test.ex>
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+DATA
+354 Send data
+.
+250 OK
+QUIT
+250 OK
+****
+exim -DCONTROL=/sender=transport -DRETURN=return_path_changed@myhost.test.ex -bs
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<userx@domain.com>
+DATA
+
+.
+QUIT
+****
+#
+#
+#
+#
+#
 sortlog
 # End

diff --git a/test/stderr/0078 b/test/stderr/0078
index 56cc9c81a6145dcea305d66719c183889a588690..a76507da47356fc81cde6011f8d2426a45386fe8 100644 (file)
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -20,8 +20,8 @@ domain = mxt6.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xx@mxt6.test.ex
-  transport: remote_smtp
+  envelope to: xx@mxt6.test.ex
+  transport:   remote_smtp
   host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -61,8 +61,8 @@ domain = mxt1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by self router
-  envelope to: myhost.test.ex@mxt1.test.ex
-  transport: remote_smtp
+  envelope to: myhost.test.ex@mxt1.test.ex
+  transport:   remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -117,8 +117,8 @@ domain = mxt1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by self2 router
-  envelope to: xx@mxt1.test.ex
-  transport: remote_smtp
+  envelope to: xx@mxt1.test.ex
+  transport:   remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

diff --git a/test/stderr/0084 b/test/stderr/0084
index c1db2a3e69ebf012ea0a0478cc91fc756fe28abc..339817ffda40d316361b67e02cdd5bb1e6298c32 100644 (file)
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -29,8 +29,8 @@ forward router generated userx@test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by forward router
-  envelope to: yes@myhost.test.ex
-  transport: <none>
+  envelope to: yes@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> localuser router <--------
@@ -44,8 +44,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=userx
 routed by localuser router
-  envelope to: userx@test.ex
-  transport: <none>
+  envelope to: userx@test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing no@myhost.test.ex
 --------> smart router <--------
@@ -63,6 +63,6 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by smart router
-  envelope to: no@myhost.test.ex
-  transport: <none>
+  envelope to: no@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0085 b/test/stderr/0085
index 6637329c89fe063132eb56554e1d2a294b6115b2..2bec2d1f2a144d1b1565ce88ef000d0a17901c1d 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -115,8 +115,8 @@ domain = smart.domain
   errors_to=NULL
   domain_data=smart.domain local_part_data=x
 routed by smart1 router
-  envelope to: x@smart.domain
-  transport: <none>
+  envelope to: x@smart.domain
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -222,8 +222,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=test.ex local_part_data=x
 routed by smart2 router
-  envelope to: x@test.ex
-  transport: dummy
+  envelope to: x@test.ex
+  transport:   dummy
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

diff --git a/test/stderr/0117 b/test/stderr/0117
index 60bbef8c53a5ad8bc2f5184ed9f098a37e6bd9d8..2e088e8e31a26336bc46a2d53f3edd22e4100cfe 100644 (file)
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -15,8 +15,8 @@ domain = mxt9.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xxx@mxt9.test.ex
-  transport: <none>
+  envelope to: xxx@mxt9.test.ex
+  transport:   <none>
   host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
   host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no
   host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no
@@ -38,8 +38,8 @@ domain = mxt9a.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xxx@mxt9a.test.ex
-  transport: <none>
+  envelope to: xxx@mxt9a.test.ex
+  transport:   <none>
   host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
   host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no
   host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no
@@ -61,8 +61,8 @@ domain = mxt9b.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xxx@mxt9b.test.ex
-  transport: <none>
+  envelope to: xxx@mxt9b.test.ex
+  transport:   <none>
   host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
   host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no
   host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no

diff --git a/test/stderr/0149 b/test/stderr/0149
index 1dcf8893e3490cd7ddd1f279c9563743659f7ea6..954ec58cd45a8e47a8db112fe0279241f0f45ca6 100644 (file)
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -24,8 +24,8 @@ domain = ten
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
-  envelope to: x@ten
-  transport: <none>
+  envelope to: x@ten
+  transport:   <none>
   host V4NET.0.0.0 [V4NET.0.0.0]
   host V4NET.0.0.1 [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -52,8 +52,8 @@ domain = two
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
-  envelope to: y@two
-  transport: <none>
+  envelope to: y@two
+  transport:   <none>
   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -77,8 +77,8 @@ domain = test1
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router
-  envelope to: x@test1
-  transport: local_delivery
+  envelope to: x@test1
+  transport:   local_delivery
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test2
 --------> domainlist1 router <--------
@@ -99,8 +99,8 @@ domain = test2
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router
-  envelope to: x@test2
-  transport: local_delivery
+  envelope to: x@test2
+  transport:   local_delivery
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test3-4
 --------> domainlist1 router <--------
@@ -121,8 +121,8 @@ domain = test3-4
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by local router
-  envelope to: x@test3-4
-  transport: local_delivery
+  envelope to: x@test3-4
+  transport:   local_delivery
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@one
 --------> domainlist1 router <--------
@@ -159,8 +159,8 @@ domain = one
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
-  envelope to: x@one
-  transport: <none>
+  envelope to: x@one
+  transport:   <none>
   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -197,8 +197,8 @@ domain = six
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
-  envelope to: x@six
-  transport: <none>
+  envelope to: x@six
+  transport:   <none>
   host V4NET.0.0.6 [V4NET.0.0.6]
   host V4NET.0.0.7 [V4NET.0.0.7]
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0161 b/test/stderr/0161
index 75986186e64161ec0ae770a650163036a2683c7b..0cd45e8e1ebaf2ef4f315798219226e5843ddc72 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -27,8 +27,8 @@ domain = mxt6.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xx@mxt6.test.ex
-  transport: remote_smtp
+  envelope to: xx@mxt6.test.ex
+  transport:   remote_smtp
   host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -82,8 +82,8 @@ domain = mxt1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by self router
-  envelope to: myhost.test.ex@mxt1.test.ex
-  transport: remote_smtp
+  envelope to: myhost.test.ex@mxt1.test.ex
+  transport:   remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -152,8 +152,8 @@ domain = mxt1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by self2 router
-  envelope to: xx@mxt1.test.ex
-  transport: remote_smtp
+  envelope to: xx@mxt1.test.ex
+  transport:   remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

diff --git a/test/stderr/0183 b/test/stderr/0183
index cbb0020d959b99d2ba86086a3e4c69bae534ea8c..b95de81702e080cb197477e47191940b967fdbb2 100644 (file)
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -151,8 +151,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: abcd@ten-1.test.ex
-  transport: smtp
+  envelope to: abcd@ten-1.test.ex
+  transport:   smtp
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Testing usery@test.again.dns
@@ -288,8 +288,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xyz@ten-1.test.ex
-  transport: smtp
+  envelope to: xyz@ten-1.test.ex
+  transport:   smtp
   host ten-1.test.ex [V4NET.0.0.1]
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
@@ -445,8 +445,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: abcd@ten-1.test.ex
-  transport: smtp
+  envelope to: abcd@ten-1.test.ex
+  transport:   smtp
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Testing usery@test.fail.dns
@@ -581,8 +581,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xyz@ten-1.test.ex
-  transport: smtp
+  envelope to: xyz@ten-1.test.ex
+  transport:   smtp
   host ten-1.test.ex [V4NET.0.0.1]
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
@@ -739,8 +739,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: abcd@ten-1.test.ex
-  transport: smtp
+  envelope to: abcd@ten-1.test.ex
+  transport:   smtp
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Testing usery@nonexist.test.ex
@@ -876,8 +876,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by lookuphost router
-  envelope to: xyz@ten-1.test.ex
-  transport: smtp
+  envelope to: xyz@ten-1.test.ex
+  transport:   smtp
   host ten-1.test.ex [V4NET.0.0.1]
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0275 b/test/stderr/0275
index 1a98284a90f49f758d1ca7fddc09950a106596cc..bcfce6f93a5cd12168e2ba85ca0cef968143f523 100644 (file)
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -182,8 +182,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=test.ex local_part_data=userx
 routed by r3 router
-  envelope to: userx@test.ex
-  transport: t1
+  envelope to: userx@test.ex
+  transport:   t1
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -447,8 +447,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=test.ex local_part_data=userx
 routed by r3 router
-  envelope to: userx@test.ex
-  transport: t1
+  envelope to: userx@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0278 b/test/stderr/0278
index 1d5929dffe947c2fd43b77a1ce1ca8ee5b1e7b00..f8b13e3857c5cb3a128656592229f3d5518e32aa 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -87,8 +87,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=CALLER
 routed by r3 router
-  envelope to: CALLER@test.ex
-  transport: t1
+  envelope to: CALLER@test.ex
+  transport:   t1
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -247,8 +247,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=CALLER
 routed by r3 router
-  envelope to: CALLER@test.ex
-  transport: t1
+  envelope to: CALLER@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0279 b/test/stderr/0279
index 9088c39fe459aec94aa63e98772fc842d03bb42c..a8733b45cf3773d6f7b0e4ed832740fceb7760c0 100644 (file)
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -105,8 +105,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=CALLER
 routed by r3 router
-  envelope to: CALLER@test.ex
-  transport: t1
+  envelope to: CALLER@test.ex
+  transport:   t1
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

diff --git a/test/stderr/0315 b/test/stderr/0315
index 7495a8145c083e5700cdb3f1193e640a4f4b4e17..f62359bd8bea0a681754f041f06d0a3808c5ae15 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -36,8 +36,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=ten-1.test.ex local_part_data=NULL
 routed by r1 router
-  envelope to: y@ten-1.test.ex
-  transport: t1
+  envelope to: y@ten-1.test.ex
+  transport:   t1
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@ten-1.test.ex
@@ -100,8 +100,8 @@ domain = ten-2.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: y@ten-2.test.ex
-  transport: t1
+  envelope to: y@ten-2.test.ex
+  transport:   t1
   host ten-2.test.ex [V4NET.0.0.2]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@ten-2.test.ex
@@ -121,8 +121,8 @@ domain = ten-2.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: x@ten-2.test.ex
-  transport: t1
+  envelope to: x@ten-2.test.ex
+  transport:   t1
   host ten-2.test.ex [V4NET.0.0.2]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:

diff --git a/test/stderr/0332 b/test/stderr/0332
index 54cd5d8d24a0a4a17f6ea188cead99806eb05d7d..8ec4372a52093a27401ecb89ece9e9dda6176280 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -23,8 +23,8 @@ domain = no.delay
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router
-  envelope to: ok@no.delay
-  transport: t1
+  envelope to: ok@no.delay
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -61,8 +61,8 @@ domain = no.delay
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router
-  envelope to: ok@no.delay
-  transport: t1
+  envelope to: ok@no.delay
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0333 b/test/stderr/0333
index 44f2f123bb66b13cadb9b031e5296ef81746167b..c4f3ecff1fc63a27facece3451c56c68c331187d 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -21,8 +21,8 @@ domain = no.delay
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router
-  envelope to: ok@no.delay
-  transport: t1
+  envelope to: ok@no.delay
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -59,8 +59,8 @@ domain = no.delay
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router
-  envelope to: ok@no.delay
-  transport: t1
+  envelope to: ok@no.delay
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0360 b/test/stderr/0360
index 724a67d02a77db7462a99de9413ffa1bc740447f..7a217597829be558b06b8f34a595dc4ebd588446 100644 (file)
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -49,8 +49,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=postmaster
 routed by v0 router
-  envelope to: postmaster@test.ex
-  transport: <none>
+  envelope to: postmaster@test.ex
+  transport:   <none>
 ------ End verifying errors address postmaster@test.ex ------
 r2 router generated defer@test.ex
   errors_to=postmaster@test.ex transport=NULL
@@ -59,9 +59,9 @@ r2 router generated unknown@recurse.test.ex
   errors_to=postmaster@test.ex transport=NULL
   uid=unset gid=unset home=NULL
 routed by r2 router
-  envelope to: cms@test.ex
-  transport: <none>
-  errors to postmaster@test.ex
+  envelope to: cms@test.ex
+  transport:   <none>
+  errors to:   postmaster@test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: unknown@recurse.test.ex
@@ -134,9 +134,9 @@ domain = recurse.test.ex.test.ex
   errors_to=postmaster@test.ex
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: unknown@recurse.test.ex.test.ex
-  transport: t1
-  errors to postmaster@test.ex
+  envelope to: unknown@recurse.test.ex.test.ex
+  transport:   t1
+  errors to:   postmaster@test.ex
   host recurse.test.ex.test.ex [V4NET.99.0.2]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
@@ -195,8 +195,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=postmaster
 routed by v0 router
-  envelope to: postmaster@test.ex
-  transport: <none>
+  envelope to: postmaster@test.ex
+  transport:   <none>
 ------ End verifying errors address postmaster@test.ex ------
 r2 router generated defer@test.ex
   errors_to=postmaster@test.ex transport=NULL
@@ -205,9 +205,9 @@ r2 router generated unknown@recurse.test.ex
   errors_to=postmaster@test.ex transport=NULL
   uid=unset gid=unset home=NULL
 routed by r2 router
-  envelope to: cms@test.ex
-  transport: <none>
-  errors to postmaster@test.ex
+  envelope to: cms@test.ex
+  transport:   <none>
+  errors to:   postmaster@test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: unknown@recurse.test.ex

diff --git a/test/stderr/0361 b/test/stderr/0361
index afd7dbcf4e0989ebd3af135ca5b99e391ee2d500..44d08c53bf817c5c9d1d32dd68b0f8e6875e90b1 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -175,8 +175,8 @@ r3 router generated kilos@recurse.test.ex.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r3 router
-  envelope to: kilos@recurse.test.ex.test.ex
-  transport: <none>
+  envelope to: kilos@recurse.test.ex.test.ex
+  transport:   <none>
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: kilos@recurse.test.ex.test.ex
@@ -215,8 +215,8 @@ domain = recurse.test.ex.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r4 router
-  envelope to: kilos@recurse.test.ex.test.ex
-  transport: t2
+  envelope to: kilos@recurse.test.ex.test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0362 b/test/stderr/0362
index 132df8c8e4d6202c9431c8d4a643af8cb6525dad..3eea0c96d03bccd75a29fce81ffd97a1f28c3cfc 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -111,8 +111,8 @@ domain = x.test.ex
   errors_to=NULL
   domain_data=*.test.ex local_part_data=NULL
 routed by r2 router
-  envelope to: x@x.test.ex
-  transport: t2
+  envelope to: x@x.test.ex
+  transport:   t2
 ----------- end verify ------------
 accept: condition test succeeded in ACL check_rcpt
 end of ACL check_rcpt: ACCEPT

diff --git a/test/stderr/0364 b/test/stderr/0364
index 4a33285162300375ace5815159d895f9d7bb479c..6f5f8eb30b19226e7863446d0d787166b6ecf01b 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -19,8 +19,8 @@ r1 router generated kilos@thishost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: kilos@thishost
-  transport: <none>
+  envelope to: kilos@thishost
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing kilos@thishost.test.ex
 --------> r2 router <--------
@@ -46,8 +46,8 @@ domain = thishost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r5 router
-  envelope to: kilos@thishost.test.ex
-  transport: t2
+  envelope to: kilos@thishost.test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing solik@otherhost
 --------> r1 router <--------
@@ -64,8 +64,8 @@ r1 router generated solik@otherhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: solik@otherhost
-  transport: <none>
+  envelope to: solik@otherhost
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing solik@otherhost.test.ex
 --------> r2 router <--------
@@ -93,8 +93,8 @@ r3 router generated solik@otherhost.sub.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r3 router
-  envelope to: solik@otherhost.test.ex
-  transport: <none>
+  envelope to: solik@otherhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing solik@otherhost.sub.test.ex
 --------> r2 router <--------
@@ -139,8 +139,8 @@ r1 router generated xxx@ten-1.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: xxx@ten-1
-  transport: <none>
+  envelope to: xxx@ten-1
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@ten-1.test.ex
 --------> r2 router <--------
@@ -157,8 +157,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: xxx@ten-1.test.ex
-  transport: t1
+  envelope to: xxx@ten-1.test.ex
+  transport:   t1
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@testsub
@@ -176,8 +176,8 @@ r1 router generated xxx@testsub.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: xxx@testsub
-  transport: <none>
+  envelope to: xxx@testsub
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@testsub.test.ex
 --------> r2 router <--------
@@ -205,8 +205,8 @@ r3 router generated xxx@testsub.sub.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r3 router
-  envelope to: xxx@testsub.test.ex
-  transport: <none>
+  envelope to: xxx@testsub.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@testsub.sub.test.ex
 --------> r2 router <--------
@@ -222,7 +222,7 @@ domain = testsub.sub.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: xxx@testsub.sub.test.ex
-  transport: t1
+  envelope to: xxx@testsub.sub.test.ex
+  transport:   t1
   host testsub.sub.test.ex [V4NET.99.0.3]
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0374 b/test/stderr/0374
index 44d28d827354d4de6b82efb009ee02818fc76e82..59ef35de47baf95ec3412d68d17694132d3a5073 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -65,8 +65,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
-  envelope to: d3@myhost.test.ex
-  transport: ut4
+  envelope to: d3@myhost.test.ex
+  transport:   ut4
 "unseen" set: replicated d3@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d2@myhost.test.ex
@@ -96,8 +96,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
-  envelope to: d2@myhost.test.ex
-  transport: ut4
+  envelope to: d2@myhost.test.ex
+  transport:   ut4
 "unseen" set: replicated d2@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d1@myhost.test.ex
@@ -127,8 +127,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
-  envelope to: d1@myhost.test.ex
-  transport: ut4
+  envelope to: d1@myhost.test.ex
+  transport:   ut4
 "unseen" set: replicated d1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing c1@myhost.test.ex
@@ -154,8 +154,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^c\d
 routed by ut3 router (unseen)
-  envelope to: c1@myhost.test.ex
-  transport: ut3
+  envelope to: c1@myhost.test.ex
+  transport:   ut3
 "unseen" set: replicated c1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing b1@myhost.test.ex
@@ -176,8 +176,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^b\d
 routed by ut2 router (unseen)
-  envelope to: b1@myhost.test.ex
-  transport: ut2
+  envelope to: b1@myhost.test.ex
+  transport:   ut2
 "unseen" set: replicated b1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing a1@myhost.test.ex
@@ -193,8 +193,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^a\d
 routed by u1 router (unseen)
-  envelope to: a1@myhost.test.ex
-  transport: ut1
+  envelope to: a1@myhost.test.ex
+  transport:   ut1
 "unseen" set: replicated a1@myhost.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -234,8 +234,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: d3@myhost.test.ex
-  transport: real
+  envelope to: d3@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d2@myhost.test.ex
 --------> real router <--------
@@ -248,8 +248,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: d2@myhost.test.ex
-  transport: real
+  envelope to: d2@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d1@myhost.test.ex
 --------> real router <--------
@@ -262,8 +262,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: d1@myhost.test.ex
-  transport: real
+  envelope to: d1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing c1@myhost.test.ex
 --------> ut4 router <--------
@@ -281,8 +281,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: c1@myhost.test.ex
-  transport: real
+  envelope to: c1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing b1@myhost.test.ex
 --------> ut3 router <--------
@@ -305,8 +305,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: b1@myhost.test.ex
-  transport: real
+  envelope to: b1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing a1@myhost.test.ex
 --------> ut2 router <--------
@@ -334,8 +334,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: a1@myhost.test.ex
-  transport: real
+  envelope to: a1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -445,8 +445,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: CALLER@myhost.test.ex
-  transport: real
+  envelope to: CALLER@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0375 b/test/stderr/0375
index 323cfe7f02661a2a8e7ae582668bbcb5a84436d2..9ec5b7cf7b88ad635d2d231eceda9d407012b38c 100644 (file)
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -135,9 +135,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^f\d
 routed by ut6 router (unseen)
-  envelope to: f3@myhost.test.ex
-  transport: ut6
-  errors to 
+  envelope to: f3@myhost.test.ex
+  transport:   ut6
+  errors to:   
 "unseen" set: replicated f3@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing f2@myhost.test.ex
@@ -178,9 +178,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^f\d
 routed by ut6 router (unseen)
-  envelope to: f2@myhost.test.ex
-  transport: ut6
-  errors to 
+  envelope to: f2@myhost.test.ex
+  transport:   ut6
+  errors to:   
 "unseen" set: replicated f2@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing f1@myhost.test.ex
@@ -221,9 +221,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^f\d
 routed by ut6 router (unseen)
-  envelope to: f1@myhost.test.ex
-  transport: ut6
-  errors to 
+  envelope to: f1@myhost.test.ex
+  transport:   ut6
+  errors to:   
 "unseen" set: replicated f1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing e1@myhost.test.ex
@@ -259,8 +259,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^e\d
 routed by ut5 router (unseen)
-  envelope to: e1@myhost.test.ex
-  transport: ut5
+  envelope to: e1@myhost.test.ex
+  transport:   ut5
 "unseen" set: replicated e1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d3@myhost.test.ex
@@ -291,9 +291,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
-  envelope to: d3@myhost.test.ex
-  transport: ut4
-  errors to 
+  envelope to: d3@myhost.test.ex
+  transport:   ut4
+  errors to:   
 "unseen" set: replicated d3@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d2@myhost.test.ex
@@ -323,9 +323,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
-  envelope to: d2@myhost.test.ex
-  transport: ut4
-  errors to 
+  envelope to: d2@myhost.test.ex
+  transport:   ut4
+  errors to:   
 "unseen" set: replicated d2@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d1@myhost.test.ex
@@ -355,9 +355,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^d\d
 routed by ut4 router (unseen)
-  envelope to: d1@myhost.test.ex
-  transport: ut4
-  errors to 
+  envelope to: d1@myhost.test.ex
+  transport:   ut4
+  errors to:   
 "unseen" set: replicated d1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing c1@myhost.test.ex
@@ -383,9 +383,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^c\d
 routed by ut3 router (unseen)
-  envelope to: c1@myhost.test.ex
-  transport: ut3
-  errors to 
+  envelope to: c1@myhost.test.ex
+  transport:   ut3
+  errors to:   
 "unseen" set: replicated c1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing b1@myhost.test.ex
@@ -406,9 +406,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^b\d
 routed by ut2 router (unseen)
-  envelope to: b1@myhost.test.ex
-  transport: ut2
-  errors to 
+  envelope to: b1@myhost.test.ex
+  transport:   ut2
+  errors to:   
 "unseen" set: replicated b1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing a1@myhost.test.ex
@@ -424,9 +424,9 @@ domain = myhost.test.ex
   errors_to=
   domain_data=NULL local_part_data=^a\d
 routed by u1 router (unseen)
-  envelope to: a1@myhost.test.ex
-  transport: ut1
-  errors to 
+  envelope to: a1@myhost.test.ex
+  transport:   ut1
+  errors to:   
 "unseen" set: replicated a1@myhost.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -492,8 +492,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: f3@myhost.test.ex
-  transport: real
+  envelope to: f3@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing f2@myhost.test.ex
 --------> ut7 router <--------
@@ -516,8 +516,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: f2@myhost.test.ex
-  transport: real
+  envelope to: f2@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing f1@myhost.test.ex
 --------> ut7 router <--------
@@ -540,8 +540,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: f1@myhost.test.ex
-  transport: real
+  envelope to: f1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing e1@myhost.test.ex
 --------> ut6 router <--------
@@ -569,8 +569,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: e1@myhost.test.ex
-  transport: real
+  envelope to: e1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d3@myhost.test.ex
 --------> ut5 router <--------
@@ -603,8 +603,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: d3@myhost.test.ex
-  transport: real
+  envelope to: d3@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d2@myhost.test.ex
 --------> ut5 router <--------
@@ -637,8 +637,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: d2@myhost.test.ex
-  transport: real
+  envelope to: d2@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing d1@myhost.test.ex
 --------> ut5 router <--------
@@ -671,8 +671,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: d1@myhost.test.ex
-  transport: real
+  envelope to: d1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing c1@myhost.test.ex
 --------> ut4 router <--------
@@ -710,8 +710,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: c1@myhost.test.ex
-  transport: real
+  envelope to: c1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing b1@myhost.test.ex
 --------> ut3 router <--------
@@ -754,8 +754,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: b1@myhost.test.ex
-  transport: real
+  envelope to: b1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing a1@myhost.test.ex
 --------> ut2 router <--------
@@ -803,8 +803,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: a1@myhost.test.ex
-  transport: real
+  envelope to: a1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -984,8 +984,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: CALLER@myhost.test.ex
-  transport: real
+  envelope to: CALLER@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -1074,8 +1074,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=^h\d
 routed by ut8 router (unseen)
-  envelope to: h1@myhost.test.ex
-  transport: ut1
+  envelope to: h1@myhost.test.ex
+  transport:   ut1
 "unseen" set: replicated h1@myhost.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: h1@myhost.test.ex
@@ -1094,8 +1094,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by real router
-  envelope to: h1@myhost.test.ex
-  transport: real
+  envelope to: h1@myhost.test.ex
+  transport:   real
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0377 b/test/stderr/0377
index f212cdb2ee0867607a3c1da81e6e0acd8fc50171..186c897c2af4514800b6b437754625f8a01ac8eb 100644 (file)
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -73,8 +73,8 @@ cccc_redirect router generated cccc@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by cccc_redirect router
-  envelope to: cccc@myhost.test.ex
-  transport: <none>
+  envelope to: cccc@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing bbbb@myhost.test.ex
 --------> defer router <--------
@@ -110,8 +110,8 @@ bbbb router generated bbbb@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by bbbb router
-  envelope to: bbbb@myhost.test.ex
-  transport: <none>
+  envelope to: bbbb@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing aaaa@myhost.test.ex
 --------> defer router <--------
@@ -133,8 +133,8 @@ unseen_aaaa router generated defer_aaaa@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by unseen_aaaa router (unseen)
-  envelope to: aaaa@myhost.test.ex
-  transport: <none>
+  envelope to: aaaa@myhost.test.ex
+  transport:   <none>
 "unseen" set: replicated aaaa@myhost.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -222,8 +222,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=cccc
 routed by cccc_accept router
-  envelope to: cccc@myhost.test.ex
-  transport: t1
+  envelope to: cccc@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing defer_bbbb@myhost.test.ex
 --------> defer router <--------
@@ -270,8 +270,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=bbbb
 routed by bbbb_0 router
-  envelope to: bbbb@myhost.test.ex
-  transport: t1
+  envelope to: bbbb@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing defer_aaaa@myhost.test.ex
 --------> defer router <--------
@@ -301,8 +301,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=aaaa
 routed by seen_aaaa router
-  envelope to: aaaa@myhost.test.ex
-  transport: t1
+  envelope to: aaaa@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -386,8 +386,8 @@ cccc_2nd_time router generated cccc@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by cccc_2nd_time router
-  envelope to: cccc@myhost.test.ex
-  transport: <none>
+  envelope to: cccc@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing bbbb@myhost.test.ex
 --------> defer router <--------
@@ -422,8 +422,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=bbbb
 routed by bbbb_0 router
-  envelope to: bbbb@myhost.test.ex
-  transport: t1
+  envelope to: bbbb@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing aaaa@myhost.test.ex
 --------> defer router <--------
@@ -448,8 +448,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=aaaa
 routed by seen_aaaa router
-  envelope to: aaaa@myhost.test.ex
-  transport: t1
+  envelope to: aaaa@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: cccc@myhost.test.ex
 unique = \0\cccc@myhost.test.ex
@@ -500,8 +500,8 @@ cccc_redirect router generated cccc@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by cccc_redirect router
-  envelope to: cccc@myhost.test.ex
-  transport: <none>
+  envelope to: cccc@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: cccc@myhost.test.ex
 unique = \1\cccc@myhost.test.ex
@@ -568,8 +568,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=cccc
 routed by cccc_accept router
-  envelope to: cccc@myhost.test.ex
-  transport: t1
+  envelope to: cccc@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -647,8 +647,8 @@ cccc_2nd_time router generated cccc@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by cccc_2nd_time router
-  envelope to: cccc@myhost.test.ex
-  transport: <none>
+  envelope to: cccc@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing bbbb@myhost.test.ex
 --------> defer router <--------
@@ -683,8 +683,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=bbbb
 routed by bbbb_0 router
-  envelope to: bbbb@myhost.test.ex
-  transport: t1
+  envelope to: bbbb@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing aaaa@myhost.test.ex
 --------> defer router <--------
@@ -709,8 +709,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=aaaa
 routed by seen_aaaa router
-  envelope to: aaaa@myhost.test.ex
-  transport: t1
+  envelope to: aaaa@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: cccc@myhost.test.ex
 unique = \0\cccc@myhost.test.ex
@@ -761,8 +761,8 @@ cccc_redirect router generated cccc@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by cccc_redirect router
-  envelope to: cccc@myhost.test.ex
-  transport: <none>
+  envelope to: cccc@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: cccc@myhost.test.ex
 unique = \1\cccc@myhost.test.ex
@@ -829,8 +829,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=cccc
 routed by cccc_accept router
-  envelope to: cccc@myhost.test.ex
-  transport: t1
+  envelope to: cccc@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0379 b/test/stderr/0379
index 2440d10ad5ae98439f3f8c28295119ebd29f26bf..c42ed221c13106a6a3315df48ece27ce842dd715 100644 (file)
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -44,8 +44,8 @@ aaaa_redirect router generated bbbb@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by aaaa_redirect router
-  envelope to: aaaa@myhost.test.ex
-  transport: <none>
+  envelope to: aaaa@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing defer@myhost.test.ex
 --------> defer router <--------
@@ -94,8 +94,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=cccc
 routed by bc router
-  envelope to: cccc@myhost.test.ex
-  transport: t1
+  envelope to: cccc@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing bbbb@myhost.test.ex
 --------> defer router <--------
@@ -119,8 +119,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=bbbb
 routed by bc router
-  envelope to: bbbb@myhost.test.ex
-  transport: t1
+  envelope to: bbbb@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0380 b/test/stderr/0380
index 38bbcd1be6caf3e941a6f00d34f08183d19e1fd2..a0c782ef53d5787ba29ab2940699add168254457 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -51,8 +51,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r3 router
-  envelope to: bbbb@myhost.test.ex
-  transport: t1
+  envelope to: bbbb@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing aaaa@myhost.test.ex
 --------> r0 router <--------

diff --git a/test/stderr/0386 b/test/stderr/0386
index fedf1e3d32a7ca12152e5a9d8748168013fa5fcc..68874191409abc35544a44a8ddac6a4d02bd3ea4 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -85,8 +85,8 @@ domain = y
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: x@y
-  transport: t1
+  envelope to: x@y
+  transport:   t1
  ----------- end verify ------------
  sender x@y verified ok
  require: condition test succeeded in ACL TESTSUITE/aux-fixed/0386.acl1
@@ -147,8 +147,8 @@ domain = y
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: x@y
-  transport: t1
+  envelope to: x@y
+  transport:   t1
  ----------- end verify ------------
  sender x@y verified ok
  require: condition test succeeded in ACL TESTSUITE/aux-fixed/0386.acl1
@@ -334,8 +334,8 @@ domain = b
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: 2@b
-  transport: t1
+  envelope to: 2@b
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -525,8 +525,8 @@ domain = b
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: 2@b
-  transport: t1
+  envelope to: 2@b
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0388 b/test/stderr/0388
index af748ebdd8c82f74f0dcad6dd2128cf87c0cf6e6..ee12baf1f09a1d58d6090297b2d2da1b41477772 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -57,8 +57,8 @@ domain = y
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: x@y
-  transport: smtp
+  envelope to: x@y
+  transport:   smtp
   host 127.0.0.1 [127.0.0.1]
   host V4NET.0.0.0 [V4NET.0.0.0]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -237,6 +237,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
+receive_msg: tidyup
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000
 Exim version x.yz ....

diff --git a/test/stderr/0391 b/test/stderr/0391
index 3c59e399eda2896b91a0f41c538aa4d8273dc080..e55d5db8c3ddfa9a2f9b09b766f02942f0d72624 100644 (file)
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -66,8 +66,8 @@ domain = x.y
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: U@x.y
-  transport: <none>
+  envelope to: U@x.y
+  transport:   <none>
 ----------- end verify ------------
 sender U@W.x.y verified ok as U@x.y
 accept: condition test succeeded in ACL acl_rcpt

diff --git a/test/stderr/0398 b/test/stderr/0398
index 655322918d2516b93429943f5f1935370864c9ca..03468d71d66f7003db428b91a95017fcf17e9119 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -77,8 +77,8 @@ domain = remote
   errors_to=NULL
   domain_data=remote local_part_data=NULL
 routed by r2 router
-  envelope to: qq@remote
-  transport: t2
+  envelope to: qq@remote
+  transport:   t2
   host 127.0.0.1 [127.0.0.1]
 ----------- end verify ------------
 sender qq@remote verified ok
@@ -135,8 +135,8 @@ domain = remote
   errors_to=NULL
   domain_data=remote local_part_data=NULL
 routed by r2 router
-  envelope to: qq@remote
-  transport: t2
+  envelope to: qq@remote
+  transport:   t2
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
@@ -262,8 +262,8 @@ domain = remote
   errors_to=NULL
   domain_data=remote local_part_data=NULL
 routed by r2 router
-  envelope to: qq@remote
-  transport: t2
+  envelope to: qq@remote
+  transport:   t2
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR

diff --git a/test/stderr/0402 b/test/stderr/0402
index 2009b5509e89287a50048878624ac9acd596bcc1..8251e156bfa8a15369c4b6f52dfecf26dfb178e3 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -559,8 +559,8 @@ r5 router generated TESTSUITE/test-mail/junk
   uid=unset gid=unset home=/non-exist/$local_part
 try option unseen
 routed by r5 router
-  envelope to: rd+usery@test.ex
-  transport: <none>
+  envelope to: rd+usery@test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing rd+CALLER@test.ex
 --------> r1 router <--------
@@ -620,8 +620,8 @@ r4 router generated TESTSUITE/test-mail/junk
   uid=unset gid=unset home=/non-exist/CALLER
 try option unseen
 routed by r4 router
-  envelope to: rd+CALLER@test.ex
-  transport: <none>
+  envelope to: rd+CALLER@test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userz@test.ex
 --------> r1 router <--------
@@ -668,8 +668,8 @@ domain = test.ex
   domain_data=NULL local_part_data=userz
 try option unseen
 routed by r3 router
-  envelope to: userz@test.ex
-  transport: t2
+  envelope to: userz@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing usery@test.ex
 --------> r1 router <--------
@@ -709,8 +709,8 @@ domain = test.ex
   domain_data=NULL local_part_data=usery
 try option unseen
 routed by r2 router
-  envelope to: usery@test.ex
-  transport: t1
+  envelope to: usery@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing CALLER@test.ex
 --------> r1 router <--------
@@ -743,8 +743,8 @@ domain = test.ex
   domain_data=NULL local_part_data=CALLER
 try option unseen
 routed by r1 router
-  envelope to: CALLER@test.ex
-  transport: t1
+  envelope to: CALLER@test.ex
+  transport:   t1
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/junk

diff --git a/test/stderr/0403 b/test/stderr/0403
index cdca19eb7b8a4c2ee8cc4b7163883285f8d819ea..96adb40aece63575664b0a37ec6715bdd42bd30f 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -156,8 +156,8 @@ r2 router generated TESTSUITE/test-mail/junk
   errors_to=NULL transport=t1
   uid=unset gid=unset home=/usr
 routed by r2 router
-  envelope to: userx@test.ex
-  transport: <none>
+  envelope to: userx@test.ex
+  transport:   <none>
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/junk
@@ -365,8 +365,8 @@ r1 router generated TESTSUITE/test-mail/junk
   errors_to=NULL transport=t1
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: charlie@dom1.ain
-  transport: <none>
+  envelope to: charlie@dom1.ain
+  transport:   <none>
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/junk

diff --git a/test/stderr/0408 b/test/stderr/0408
index e4575e4892ffbc7e3443eb4e8a4b0322377e74e3..befa855fbc81b30cda4d06da97f29b4c0737a1e6 100644 (file)
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -116,18 +116,18 @@ domain = test.ex
   errors_to=usery
   domain_data=NULL local_part_data=usery
 routed by r1 router
-  envelope to: usery@test.ex
-  transport: t1
-  errors to usery
+  envelope to: usery@test.ex
+  transport:   t1
+  errors to:   usery
 ------ End verifying errors address usery ------
 queued for t1 transport: local_part = userx
 domain = test.ex
   errors_to=usery@test.ex
   domain_data=NULL local_part_data=userx
 routed by r1 router
-  envelope to: userx@test.ex
-  transport: t1
-  errors to usery@test.ex
+  envelope to: userx@test.ex
+  transport:   t1
+  errors to:   usery@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0414 b/test/stderr/0414
index 05abad4387e54336b4916ec97b346ad6bcaf2093..f4f345abdab0a71059c1d00872062ae296d4b6dd 100644 (file)
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -85,8 +85,8 @@ domain = b.domain
   errors_to=NULL
   domain_data=b.domain-data local_part_data=NULL
 routed by r2 router
-  envelope to: x@b.domain
-  transport: t1
+  envelope to: x@b.domain
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Testing x@a.domain
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -171,7 +171,7 @@ domain = a.domain
   errors_to=NULL
   domain_data=a.domain-data local_part_data=NULL
 routed by r3 router
-  envelope to: x@a.domain
-  transport: t1
+  envelope to: x@a.domain
+  transport:   t1
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0419 b/test/stderr/0419
index fa097e1ce3fd42be2b4f7c9fc7382173345e50f3..5a9dad75e026e4a030c806ba298cd7ec57d06108 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -74,8 +74,8 @@ domain = mxt13.test.ex
   errors_to=NULL
   domain_data=mxt13.test.ex local_part_data=NULL
 routed by dnslookup router
-  envelope to: k@mxt13.test.ex
-  transport: smtp
+  envelope to: k@mxt13.test.ex
+  transport:   smtp
   host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0426 b/test/stderr/0426
index 4503efa2dc79ef581a9bc0dc2f9724cc05eab0d7..2a819d29ba57b7efe0a8bfe75ec02aafb176f64a 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -43,8 +43,8 @@ domain = uppercase.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: x@UpperCase.test.ex
-  transport: t1
+  envelope to: x@UpperCase.test.ex
+  transport:   t1
   host uppercase.test.ex [127.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:

diff --git a/test/stderr/0432 b/test/stderr/0432
index 204cddd6b2fbd1989b8f7a521a4eb74bffa73497..5677403dc38242681976bc5be82d548fdd58ad79 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -84,8 +84,8 @@ domain = y
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: x@y
-  transport: t1
+  envelope to: x@y
+  transport:   t1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows
@@ -204,8 +204,8 @@ domain = y
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: x@y
-  transport: t1
+  envelope to: x@y
+  transport:   t1
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
 local host found for non-MX address
 MUNGED: ::1 will be omitted in what follows

diff --git a/test/stderr/0463 b/test/stderr/0463
index 391589473e6e270719cc26c18203d3bc71fee90e..ef76ad1796c0030b95f8d3e454c4a48ad5dd7fbb 100644 (file)
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -95,8 +95,8 @@ domain = ten-1.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by all router
-  envelope to: x@ten-1.test.ex
-  transport: smtp
+  envelope to: x@ten-1.test.ex
+  transport:   smtp
   host ten-1.test.ex [V4NET.0.0.1]
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0464 b/test/stderr/0464
index bed191f9b4dfeb8716ee30f2a88d14e32ae51f2a..8160fe0eb3974f5bb3be8e98e0c376e3fef28ba2 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -71,8 +71,8 @@ r1 router generated abc@xxx.domain1
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: abc@domain1
-  transport: <none>
+  envelope to: abc@domain1
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering abc@xxx.domain1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -113,8 +113,8 @@ domain = xxx.domain1
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: abc@xxx.domain1
-  transport: smtp
+  envelope to: abc@xxx.domain1
+  transport:   smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL rcpt
 processing ACL rcpt "require" (TESTSUITE/test-config 23)
@@ -151,8 +151,8 @@ r1 router generated abc@xxx.domain1
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: abc@domain1
-  transport: <none>
+  envelope to: abc@domain1
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering abc@xxx.domain1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -191,8 +191,8 @@ domain = xxx.domain1
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: abc@xxx.domain1
-  transport: smtp
+  envelope to: abc@xxx.domain1
+  transport:   smtp
 ----------- end verify ------------
 require: condition test succeeded in ACL rcpt
 processing ACL rcpt "accept" (TESTSUITE/test-config 25)

diff --git a/test/stderr/0479 b/test/stderr/0479
index 9b12968a663a83f27e8350b7f3ea09d1e2b4fc0b..03df09b2c4ecd7b3f709905c72d9db75e494e84d 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -70,8 +70,8 @@ domain = rewritten-b
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: rewritten-a@rewritten-b
-  transport: t1
+  envelope to: rewritten-a@rewritten-b
+  transport:   t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
 require: condition test succeeded in ACL rcpt

diff --git a/test/stderr/0483 b/test/stderr/0483
index ff2b49beb7b6372546b23dcd3c38c780e9846f39..d396f05b009a2681627d3e40a3883ad8076a41bb 100644 (file)
--- a/test/stderr/0483
+++ b/test/stderr/0483
@@ -22,8 +22,8 @@ domain = domain2
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: recip@domain2
-  transport: t1
+  envelope to: recip@domain2
+  transport:   t1
 other@domain2 in "lsearch;TESTSUITE/aux-fixed/0483.list"? no (end of list)
 LOG: MAIN REJECT
   U=CALLER F=<sender@domain1> rejected RCPT <other@domain2>

diff --git a/test/stderr/0487 b/test/stderr/0487
index 7fa2284424bc75a63f927e78c2c08d6c38957959..7fd9133be5f4cc3ce046143746fea9b5b38fd42f 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -128,8 +128,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: userx@test.ex
-  transport: t1
+  envelope to: userx@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0499 b/test/stderr/0499
index 0eafb00eb54234c4a72090037572027356b27d9f..489c8b1043ef9808b6fecd4a46535a26cfd1015f 100644 (file)
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -62,7 +62,7 @@ domain = mxt1.test.ex
   errors_to=NULL
   domain_data=@mx_any local_part_data=NULL
 routed by r1 router
-  envelope to: ph@mxt1.test.ex
-  transport: t1
+  envelope to: ph@mxt1.test.ex
+  transport:   t1
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0543 b/test/stderr/0543
index f43aa63fe19e9775c960927ed5ba14047c467777..81d9efbb3edb6c596efc035f38ec0c9a55126d6c 100644 (file)
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -22,8 +22,8 @@ domain = domain1
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by smarthost router
-  envelope to: userx@domain1
-  transport: smtp
+  envelope to: userx@domain1
+  transport:   smtp
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/0545 b/test/stderr/0545
index 1414e6ec3554158d566aab2c367811265b641c8c..b87e81122b8c1f15ae1971b0d28e752d43bb4671 100644 (file)
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -81,8 +81,8 @@ domain = alias-eximtesthost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by dns router
-  envelope to: userx@alias-eximtesthost.test.ex
-  transport: smtp
+  envelope to: userx@alias-eximtesthost.test.ex
+  transport:   smtp
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -138,8 +138,8 @@ domain = alias-eximtesthost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by dns router
-  envelope to: userx@alias-eximtesthost.test.ex
-  transport: smtp
+  envelope to: userx@alias-eximtesthost.test.ex
+  transport:   smtp
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0563 b/test/stderr/0563
index 8ce12a2e5c417fd9bc6af254a3e851aec1e2e0a4..30cd06ce666cdd8c60ed2725a7f58ca1d786817d 100644 (file)
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -50,7 +50,7 @@ domain = testexim.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=joe
 routed by router2 router
-  envelope to: joe-real@testexim.test.ex
-  transport: local_delivery
+  envelope to: joe-real@testexim.test.ex
+  transport:   local_delivery
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/2201 b/test/stderr/2201
index eb37f80cbb805a58cfb2faac1f750ff6ae75e65d..b003ef1e87bfce870a9f0efb130130f80ba9290d 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -68,8 +68,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=A TXT record for test.ex. local_part_data=A TXT record for test.ex.
 routed by r1 router
-  envelope to: test.ex@test.ex
-  transport: local_delivery
+  envelope to: test.ex@test.ex
+  transport:   local_delivery
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Testing unknown@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -163,8 +163,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=A TXT record for test.ex. local_part_data=NULL
 routed by r2 router
-  envelope to: unknown@test.ex
-  transport: local_delivery
+  envelope to: unknown@test.ex
+  transport:   local_delivery
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

diff --git a/test/stderr/2600 b/test/stderr/2600
index ad9b921fe249fe41cb082871c840d64a313599cf..f0765b3c8672474e9a636340f3caaf960dc7385f 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -619,8 +619,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: userx@myhost.test.ex
-  transport: t1
+  envelope to: userx@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/2610 b/test/stderr/2610
index 9517d8fc8f175ad38aa5a2816febf260ca751b2b..bf16edc30a62d03eb7a5f2bd113df80d30c5ff95 100644 (file)
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -892,8 +892,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: ph10@myhost.test.ex
-  transport: t1
+  envelope to: ph10@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/2620 b/test/stderr/2620
index 3c4305f77d61a0ee9fca081bfe9c71203119c7da..6ff7c8591c0c355e54c28735fd7f144af418ed05 100644 (file)
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -811,8 +811,8 @@ domain = myhost.test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: CALLER@myhost.test.ex
-  transport: t1
+  envelope to: CALLER@myhost.test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/4110 b/test/stderr/4110
index 19d5026951c4fb0d3dc8249bd4a78b7e8ecf8b7b..b1a5bc68ca7c52f1c0f1e48eae8c0608afde0d55 100644 (file)
--- a/test/stderr/4110
+++ b/test/stderr/4110
@@ -55,8 +55,8 @@ userfilter router generated userx@test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by userfilter router
-  envelope to: filter-userx@test.ex
-  transport: <none>
+  envelope to: filter-userx@test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
@@ -100,8 +100,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=userx
 routed by user_accept2 router
-  envelope to: userx@test.ex
-  transport: appendfile
+  envelope to: userx@test.ex
+  transport:   appendfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/4140 b/test/stderr/4140
index dc7e0c020d4e4bfd48953bb96fb9d7704221ff65..5cca0f0c9cbc9ded9814d47b09b791bb276fef20 100644 (file)
--- a/test/stderr/4140
+++ b/test/stderr/4140
@@ -20,8 +20,8 @@ r1 router generated /a/b/c
   errors_to=NULL transport=tf1
   uid=CALLER_UID gid=CALLER_GID home=NULL
 routed by r1 router
-  envelope to: /a/b/c@myhost.test.ex
-  transport: <none>
+  envelope to: /a/b/c@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 Hints DB:
@@ -45,8 +45,8 @@ r1 router generated /x/y/z
   errors_to=NULL transport=tf2
   uid=CALLER_UID gid=CALLER_GID home=NULL
 routed by r1 router
-  envelope to: /x/y/z@myhost.test.ex
-  transport: <none>
+  envelope to: /x/y/z@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss

diff --git a/test/stderr/4152 b/test/stderr/4152
index b3ab37ec9e9d72a3237407db3c8e713c1ec0600c..9c0f7b1a30fbb2f16c9c222dcd2378387eee4d83 100644 (file)
--- a/test/stderr/4152
+++ b/test/stderr/4152
@@ -69,8 +69,8 @@ aaaa router generated defer_aaaa@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by aaaa router
-  envelope to: aaaa@myhost.test.ex
-  transport: <none>
+  envelope to: aaaa@myhost.test.ex
+  transport:   <none>
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex
@@ -210,8 +210,8 @@ aaaa_2nd_time router generated aaaa@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by aaaa_2nd_time router
-  envelope to: aaaa@myhost.test.ex
-  transport: <none>
+  envelope to: aaaa@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 unique = \0\aaaa@myhost.test.ex
@@ -266,8 +266,8 @@ aaaa router generated defer_aaaa@myhost.test.ex
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by aaaa router
-  envelope to: aaaa@myhost.test.ex
-  transport: <none>
+  envelope to: aaaa@myhost.test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex
 unique = defer_aaaa@myhost.test.ex

diff --git a/test/stderr/4155 b/test/stderr/4155
index 6070650e65e4cfc68d845fab1e90efd4b8d688a6..1c3799cf14ba3f0ffe93f1f8c7a936b854b14cfc 100644 (file)
--- a/test/stderr/4155
+++ b/test/stderr/4155
@@ -214,8 +214,8 @@ r2 router generated >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex
   errors_to=NULL transport=t1
   uid=CALLER_UID gid=CALLER_GID home=NULL
 routed by r2 router
-  envelope to: userx@test.ex
-  transport: <none>
+  envelope to: userx@test.ex
+  transport:   <none>
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...
@@ -7029,8 +7029,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7047,8 +7047,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7065,8 +7065,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7083,8 +7083,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7101,8 +7101,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7119,8 +7119,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7137,8 +7137,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7155,8 +7155,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7173,8 +7173,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7191,8 +7191,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7209,8 +7209,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7227,8 +7227,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7245,8 +7245,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7263,8 +7263,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7281,8 +7281,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7299,8 +7299,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7317,8 +7317,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7335,8 +7335,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7353,8 +7353,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7371,8 +7371,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7389,8 +7389,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7407,8 +7407,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7425,8 +7425,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7443,8 +7443,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7461,8 +7461,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7479,8 +7479,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7497,8 +7497,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7515,8 +7515,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7533,8 +7533,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7551,8 +7551,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7569,8 +7569,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7587,8 +7587,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7605,8 +7605,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7623,8 +7623,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7641,8 +7641,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7659,8 +7659,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7677,8 +7677,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7695,8 +7695,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7713,8 +7713,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7731,8 +7731,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7749,8 +7749,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7767,8 +7767,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7785,8 +7785,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7803,8 +7803,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7821,8 +7821,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7839,8 +7839,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7857,8 +7857,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7875,8 +7875,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7893,8 +7893,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7911,8 +7911,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7929,8 +7929,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7947,8 +7947,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7965,8 +7965,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -7983,8 +7983,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8001,8 +8001,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8019,8 +8019,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8037,8 +8037,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8055,8 +8055,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8073,8 +8073,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8091,8 +8091,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8109,8 +8109,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8127,8 +8127,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8145,8 +8145,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8163,8 +8163,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8181,8 +8181,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8199,8 +8199,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8217,8 +8217,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8235,8 +8235,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8253,8 +8253,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8271,8 +8271,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8289,8 +8289,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8307,8 +8307,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8325,8 +8325,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8343,8 +8343,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8361,8 +8361,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8379,8 +8379,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8397,8 +8397,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8415,8 +8415,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8433,8 +8433,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8451,8 +8451,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8469,8 +8469,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8487,8 +8487,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8505,8 +8505,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8523,8 +8523,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8541,8 +8541,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8559,8 +8559,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8577,8 +8577,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8595,8 +8595,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8613,8 +8613,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8631,8 +8631,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8649,8 +8649,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8667,8 +8667,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8685,8 +8685,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8703,8 +8703,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8721,8 +8721,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8739,8 +8739,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8757,8 +8757,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8775,8 +8775,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8793,8 +8793,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8811,8 +8811,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8829,8 +8829,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8847,8 +8847,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8865,8 +8865,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8883,8 +8883,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8901,8 +8901,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8919,8 +8919,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8937,8 +8937,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8955,8 +8955,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8973,8 +8973,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -8991,8 +8991,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9009,8 +9009,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9027,8 +9027,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9045,8 +9045,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9063,8 +9063,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9081,8 +9081,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9099,8 +9099,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9117,8 +9117,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9135,8 +9135,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9153,8 +9153,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9171,8 +9171,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9189,8 +9189,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9207,8 +9207,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9225,8 +9225,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9243,8 +9243,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9261,8 +9261,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9279,8 +9279,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9297,8 +9297,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9315,8 +9315,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9333,8 +9333,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9351,8 +9351,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9369,8 +9369,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9387,8 +9387,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9405,8 +9405,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9423,8 +9423,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9441,8 +9441,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9459,8 +9459,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9477,8 +9477,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9495,8 +9495,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9513,8 +9513,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9531,8 +9531,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9549,8 +9549,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9567,8 +9567,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9585,8 +9585,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9603,8 +9603,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9621,8 +9621,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9639,8 +9639,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9657,8 +9657,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9675,8 +9675,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9693,8 +9693,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9711,8 +9711,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9729,8 +9729,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9747,8 +9747,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9765,8 +9765,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9783,8 +9783,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9801,8 +9801,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9819,8 +9819,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9837,8 +9837,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9855,8 +9855,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9873,8 +9873,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9891,8 +9891,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9909,8 +9909,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9927,8 +9927,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9945,8 +9945,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9963,8 +9963,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9981,8 +9981,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -9999,8 +9999,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10017,8 +10017,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10035,8 +10035,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10053,8 +10053,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10071,8 +10071,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10089,8 +10089,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10107,8 +10107,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10125,8 +10125,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10143,8 +10143,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10161,8 +10161,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10179,8 +10179,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10197,8 +10197,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10215,8 +10215,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10233,8 +10233,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10251,8 +10251,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10269,8 +10269,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10287,8 +10287,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10305,8 +10305,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10323,8 +10323,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10341,8 +10341,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10359,8 +10359,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10377,8 +10377,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10395,8 +10395,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10413,8 +10413,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10431,8 +10431,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10449,8 +10449,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10467,8 +10467,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10485,8 +10485,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10503,8 +10503,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10521,8 +10521,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10539,8 +10539,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10557,8 +10557,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10575,8 +10575,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10593,8 +10593,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10611,8 +10611,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10629,8 +10629,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10647,8 +10647,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10665,8 +10665,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10683,8 +10683,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10701,8 +10701,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10719,8 +10719,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10737,8 +10737,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10755,8 +10755,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10773,8 +10773,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10791,8 +10791,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10809,8 +10809,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10827,8 +10827,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10845,8 +10845,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10863,8 +10863,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10881,8 +10881,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10899,8 +10899,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10917,8 +10917,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10935,8 +10935,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10953,8 +10953,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10971,8 +10971,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -10989,8 +10989,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11007,8 +11007,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11025,8 +11025,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11043,8 +11043,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11061,8 +11061,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11079,8 +11079,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11097,8 +11097,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11115,8 +11115,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11133,8 +11133,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11151,8 +11151,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11169,8 +11169,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11187,8 +11187,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11205,8 +11205,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11223,8 +11223,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11241,8 +11241,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11259,8 +11259,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11277,8 +11277,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11295,8 +11295,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11313,8 +11313,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11331,8 +11331,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11349,8 +11349,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11367,8 +11367,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11385,8 +11385,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11403,8 +11403,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11421,8 +11421,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11439,8 +11439,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11457,8 +11457,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11475,8 +11475,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11493,8 +11493,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11511,8 +11511,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11529,8 +11529,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11547,8 +11547,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11565,8 +11565,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11583,8 +11583,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11601,8 +11601,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11619,8 +11619,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11637,8 +11637,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11655,8 +11655,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11673,8 +11673,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11691,8 +11691,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11709,8 +11709,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11727,8 +11727,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11745,8 +11745,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11763,8 +11763,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11781,8 +11781,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11799,8 +11799,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11817,8 +11817,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11835,8 +11835,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11853,8 +11853,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11871,8 +11871,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11889,8 +11889,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11907,8 +11907,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11925,8 +11925,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11943,8 +11943,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11961,8 +11961,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11979,8 +11979,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -11997,8 +11997,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12015,8 +12015,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12033,8 +12033,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12051,8 +12051,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12069,8 +12069,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12087,8 +12087,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12105,8 +12105,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12123,8 +12123,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12141,8 +12141,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12159,8 +12159,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12177,8 +12177,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12195,8 +12195,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12213,8 +12213,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12231,8 +12231,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12249,8 +12249,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12267,8 +12267,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12285,8 +12285,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12303,8 +12303,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12321,8 +12321,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12339,8 +12339,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12357,8 +12357,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12375,8 +12375,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12393,8 +12393,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12411,8 +12411,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12429,8 +12429,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12447,8 +12447,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12465,8 +12465,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12483,8 +12483,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12501,8 +12501,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12519,8 +12519,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12537,8 +12537,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12555,8 +12555,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12573,8 +12573,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12591,8 +12591,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12609,8 +12609,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12627,8 +12627,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12645,8 +12645,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12663,8 +12663,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12681,8 +12681,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12699,8 +12699,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12717,8 +12717,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12735,8 +12735,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12753,8 +12753,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12771,8 +12771,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12789,8 +12789,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12807,8 +12807,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12825,8 +12825,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12843,8 +12843,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12861,8 +12861,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12879,8 +12879,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12897,8 +12897,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12915,8 +12915,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12933,8 +12933,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12951,8 +12951,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12969,8 +12969,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -12987,8 +12987,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13005,8 +13005,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13023,8 +13023,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13041,8 +13041,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13059,8 +13059,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13077,8 +13077,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13095,8 +13095,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13113,8 +13113,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13131,8 +13131,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13149,8 +13149,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13167,8 +13167,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13185,8 +13185,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13203,8 +13203,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13221,8 +13221,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13239,8 +13239,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13257,8 +13257,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13275,8 +13275,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13293,8 +13293,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13311,8 +13311,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13329,8 +13329,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13347,8 +13347,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13365,8 +13365,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13383,8 +13383,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13401,8 +13401,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13419,8 +13419,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13437,8 +13437,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13455,8 +13455,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13473,8 +13473,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13491,8 +13491,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13509,8 +13509,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13527,8 +13527,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13545,8 +13545,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13563,8 +13563,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13581,8 +13581,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13599,8 +13599,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13617,8 +13617,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13635,8 +13635,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13653,8 +13653,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13671,8 +13671,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13689,8 +13689,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13707,8 +13707,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13725,8 +13725,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13743,8 +13743,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13761,8 +13761,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13779,8 +13779,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13797,8 +13797,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13815,8 +13815,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13833,8 +13833,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13851,8 +13851,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13869,8 +13869,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13887,8 +13887,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13905,8 +13905,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13923,8 +13923,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13941,8 +13941,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13959,8 +13959,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13977,8 +13977,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -13995,8 +13995,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14013,8 +14013,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14031,8 +14031,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14049,8 +14049,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14067,8 +14067,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14085,8 +14085,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14103,8 +14103,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14121,8 +14121,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14139,8 +14139,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14157,8 +14157,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14175,8 +14175,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14193,8 +14193,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14211,8 +14211,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14229,8 +14229,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14247,8 +14247,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14265,8 +14265,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14283,8 +14283,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14301,8 +14301,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14319,8 +14319,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14337,8 +14337,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14355,8 +14355,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14373,8 +14373,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14391,8 +14391,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14409,8 +14409,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14427,8 +14427,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14445,8 +14445,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14463,8 +14463,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14481,8 +14481,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14499,8 +14499,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14517,8 +14517,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14535,8 +14535,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14553,8 +14553,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14571,8 +14571,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14589,8 +14589,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14607,8 +14607,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14625,8 +14625,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14643,8 +14643,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14661,8 +14661,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14679,8 +14679,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14697,8 +14697,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14715,8 +14715,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14733,8 +14733,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14751,8 +14751,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14769,8 +14769,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14787,8 +14787,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14805,8 +14805,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14823,8 +14823,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14841,8 +14841,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14859,8 +14859,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14877,8 +14877,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14895,8 +14895,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14913,8 +14913,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14931,8 +14931,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14949,8 +14949,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14967,8 +14967,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -14985,8 +14985,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15003,8 +15003,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15021,8 +15021,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15039,8 +15039,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15057,8 +15057,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15075,8 +15075,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15093,8 +15093,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15111,8 +15111,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15129,8 +15129,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15147,8 +15147,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15165,8 +15165,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15183,8 +15183,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15201,8 +15201,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15219,8 +15219,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15237,8 +15237,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15255,8 +15255,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15273,8 +15273,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15291,8 +15291,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15309,8 +15309,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15327,8 +15327,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15345,8 +15345,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15363,8 +15363,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15381,8 +15381,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15399,8 +15399,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15417,8 +15417,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15435,8 +15435,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15453,8 +15453,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15471,8 +15471,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15489,8 +15489,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15507,8 +15507,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15525,8 +15525,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15543,8 +15543,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15561,8 +15561,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15579,8 +15579,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15597,8 +15597,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15615,8 +15615,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15633,8 +15633,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15651,8 +15651,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15669,8 +15669,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15687,8 +15687,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15705,8 +15705,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15723,8 +15723,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15741,8 +15741,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15759,8 +15759,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15777,8 +15777,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15795,8 +15795,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15813,8 +15813,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15831,8 +15831,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15849,8 +15849,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15867,8 +15867,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15885,8 +15885,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15903,8 +15903,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15921,8 +15921,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15939,8 +15939,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15957,8 +15957,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15975,8 +15975,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -15993,8 +15993,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16011,8 +16011,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16029,8 +16029,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16047,8 +16047,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16065,8 +16065,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16083,8 +16083,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16101,8 +16101,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16119,8 +16119,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16137,8 +16137,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16155,8 +16155,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16173,8 +16173,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16191,8 +16191,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16209,8 +16209,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16227,8 +16227,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16245,8 +16245,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16263,8 +16263,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16281,8 +16281,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16299,8 +16299,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16317,8 +16317,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16335,8 +16335,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16353,8 +16353,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16371,8 +16371,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16389,8 +16389,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16407,8 +16407,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16425,8 +16425,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16443,8 +16443,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16461,8 +16461,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16479,8 +16479,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16497,8 +16497,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16515,8 +16515,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16533,8 +16533,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16551,8 +16551,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16569,8 +16569,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16587,8 +16587,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16605,8 +16605,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16623,8 +16623,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16641,8 +16641,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16659,8 +16659,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16677,8 +16677,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16695,8 +16695,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16713,8 +16713,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16731,8 +16731,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16749,8 +16749,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16767,8 +16767,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16785,8 +16785,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16803,8 +16803,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16821,8 +16821,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16839,8 +16839,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16857,8 +16857,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16875,8 +16875,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16893,8 +16893,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16911,8 +16911,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16929,8 +16929,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16947,8 +16947,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16965,8 +16965,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -16983,8 +16983,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17001,8 +17001,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17019,8 +17019,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17037,8 +17037,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17055,8 +17055,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17073,8 +17073,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17091,8 +17091,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17109,8 +17109,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17127,8 +17127,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17145,8 +17145,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17163,8 +17163,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17181,8 +17181,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17199,8 +17199,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17217,8 +17217,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17235,8 +17235,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17253,8 +17253,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17271,8 +17271,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17289,8 +17289,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17307,8 +17307,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17325,8 +17325,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17343,8 +17343,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17361,8 +17361,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17379,8 +17379,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17397,8 +17397,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17415,8 +17415,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17433,8 +17433,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17451,8 +17451,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17469,8 +17469,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17487,8 +17487,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17505,8 +17505,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17523,8 +17523,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17541,8 +17541,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17559,8 +17559,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17577,8 +17577,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17595,8 +17595,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17613,8 +17613,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17631,8 +17631,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17649,8 +17649,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17667,8 +17667,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17685,8 +17685,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17703,8 +17703,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17721,8 +17721,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17739,8 +17739,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17757,8 +17757,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17775,8 +17775,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17793,8 +17793,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17811,8 +17811,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17829,8 +17829,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17847,8 +17847,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17865,8 +17865,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17883,8 +17883,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17901,8 +17901,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17919,8 +17919,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17937,8 +17937,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing sender@test.ex
 --------> r1 router <--------
@@ -17955,8 +17955,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=sender
 routed by r1 router
-  envelope to: sender@test.ex
-  transport: t2
+  envelope to: sender@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/5004 b/test/stderr/5004
index 41ac2b29e47d7a3c2870b9c4d2311c6fdb83b5b2..df47f4c1fc89e4452d3575d4d534af41857aec4f 100644 (file)
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -101,8 +101,8 @@ r1 router generated TESTSUITE/test-mail
   errors_to=NULL transport=t1
   uid=CALLER_UID gid=CALLER_GID home=NULL
 routed by r1 router
-  envelope to: userx@test.ex
-  transport: <none>
+  envelope to: userx@test.ex
+  transport:   <none>
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail

diff --git a/test/stderr/5005 b/test/stderr/5005
index 06da037dc94f07c2a80f75af2b9a866c2c9c532d..980b8974697788d344f4c1d0e7b878ea243cde8d 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -94,8 +94,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: nofile@test.ex
-  transport: t1
+  envelope to: nofile@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -279,8 +279,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: userx@test.ex
-  transport: t1
+  envelope to: userx@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -466,8 +466,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: userx@test.ex
-  transport: t1
+  envelope to: userx@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -662,8 +662,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: userx@test.ex
-  transport: t1
+  envelope to: userx@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/5006 b/test/stderr/5006
index a010cb023279794043ddeebde3f512e95d264cd2..35e85070185e17c5852cc56dc768d1c5912ce024 100644 (file)
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -94,8 +94,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r1 router
-  envelope to: userx@test.ex
-  transport: t1
+  envelope to: userx@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:

diff --git a/test/stderr/5204 b/test/stderr/5204
index a21d2edfddc5159258c86076625b2e1e1cf2a682..ed172be8a8baff3e8eb0dcd9a71456b7d8ca25f4 100644 (file)
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -131,8 +131,8 @@ domain = some.host
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by q router
-  envelope to: "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
-  transport: other_smtp
+  envelope to: "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
+  transport:   other_smtp
   host ten-1.test.ex [V4NET.0.0.1]
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -177,8 +177,8 @@ domain = some.host
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by s router
-  envelope to: PASS@some.host
-  transport: smtp
+  envelope to: PASS@some.host
+  transport:   smtp
   host 127.0.0.1 [127.0.0.1]
 >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -235,8 +235,8 @@ parse_forward_list: postmaster@test.ex
 extract item: postmaster@test.ex
 q router generated postmaster@test.ex
 routed by q router
-  envelope to: "REDIRECT postmaster@test.ex"@some.host
-  transport: <none>
+  envelope to: "REDIRECT postmaster@test.ex"@some.host
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing postmaster@test.ex
 --------> b router <--------
@@ -265,8 +265,8 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=postmaster
 routed by pm router
-  envelope to: postmaster@test.ex
-  transport: null
+  envelope to: postmaster@test.ex
+  transport:   null
 >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 Hints DB:

diff --git a/test/stdout/5400 b/test/stdout/5400
index 55b75044945e8a850545619bc469a3d826dfedf8..9e437edc679a41a0c42ebf6ce48656f858ef03e9 100644 (file)
--- a/test/stdout/5400
+++ b/test/stdout/5400
@@ -137,6 +137,18 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbH-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello CALLER at myhost.test.ex\r
+250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
+250-8BITMIME\r
+250-PIPELINING\r
+250 HELP\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbI-000000005vi-0000\r
+221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
@@ -575,3 +587,30 @@ and this is the next line.
 QUIT
 250 OK
 End of script
+Listening on port 1224 ... 
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.test.ex
+250 OK
+MAIL FROM:<return_path_changed@myhost.test.ex>
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER (helo=myhost.test.ex)
+       by myhost.test.ex with local-esmtp (Exim x.yz)
+       (envelope-from <CALLER@myhost.test.ex>)
+       id 10HmbI-000000005vi-0000
+       for userx@domain.com;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbI-000000005vi-0000@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-hdr-rtr-new: +++
+
+.
+250 OK
+QUIT
+250 OK
+End of script