diff -urN ../exim-4.85.orig/src/spool_mbox.c ./src/spool_mbox.c
--- ../exim-4.85.orig/src/spool_mbox.c	2015-01-06 01:40:11.000000000 +0200
+++ ./src/spool_mbox.c	2015-04-11 21:18:30.000000000 +0300
@@ -67,8 +67,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) {
       i = fwrite(temp_string, Ustrlen(temp_string), 1, mbox_file);