diff -urN ../exim-4.87.orig/src/spool_mbox.c ./src/spool_mbox.c
--- ../exim-4.87.orig/src/spool_mbox.c	2016-04-02 22:24:15.000000000 +0300
+++ ./src/spool_mbox.c	2016-04-23 22:52:21.000000000 +0300
@@ -74,8 +74,9 @@
 
   temp_string = expand_string(
     US"From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n"
-    "${if def:sender_address{X-Envelope-From: <${sender_address}>\n}}"
-    "${if def:recipients{X-Envelope-To: ${recipients}\n}}");
+    "X-Envelope-From: <${sender_address}>\n"
+    "${if def:received_for{X-Envelope-To: <${received_for}>\n}"
+    "{${if def:recipients{${if match{${recipients}}{\\N.*[, ]\\N}{}{X-Envelope-To: <${recipients}>\n}}}}}}");
 
   if (temp_string != NULL)
     {