--- exim-snapshot/src/spool_mbox.c
+++ exim-snapshot.jh1/src/spool_mbox.c
@@ -90,11 +90,11 @@
       };
     };
     /* Generate X-Envelope-To header */
-    envelope_to = expand_string(US"${if def:received_for{$received_for}}");
+    envelope_to = expand_string(US"${recipients}");
     if (envelope_to != NULL) {
       if (envelope_to[0] != 0) {
         uschar *my_envelope_to;
-        my_envelope_to = string_sprintf("X-Envelope-To: <%s>\n", envelope_to);
+        my_envelope_to = string_sprintf("X-Envelope-To: %s\n", envelope_to);
         i = fwrite(my_envelope_to, 1, Ustrlen(my_envelope_to), mbox_file);
         if (i != Ustrlen(my_envelope_to)) {
           debug_printf("error/short write on writing in: %s", mbox_path);