--- compose.inc	2012-12-02 00:20:04.000000000 +0100
+++ compose.inc.envelope_only	2012-12-05 20:44:52.000000000 +0100
@@ -436,7 +436,7 @@
     }
   }
 
-  // If matching by name+address doesn't found any amtches, get first found address (identity)
+  // If matching by name+address doesn't found any matches, get first found address (identity)
   if ($from_idx === null) {
     $from_idx = $found_idx;
   }
@@ -451,10 +451,10 @@
     }
   }
 
-  // Fallback using Delivered-To
-  if ($from_idx === null && ($delivered_to = $MESSAGE->headers->others['delivered-to'])) {
+  // Fallback using Envelope-to (Exim)
+  if ($from_idx === null && ($envelope_to = $MESSAGE->headers->others['envelope-to'])) {
     foreach ($identities as $idx => $ident) {
-      if (in_array($ident['email_ascii'], $delivered_to)) {
+      if (in_array($ident['email_ascii'], $envelope_to)) {
         $from_idx = $idx;
         break;
       }