dont guess envelope headers

darcs-hash:20041030225110-5007d-94f621f431638cc6c95141d6be371e5ff1ac6e93.gz

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index c392d3b..42cb92f 100644 (file)
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -68,16 +68,14 @@ public class Message extends MIME.Part {
                             headers.gets("Envelope-To") != null ? Address.parse(headers.gets("Envelope-To")) : null;
         this.from         = headers.gets("From") != null ? Address.parse(headers.gets("From")) : 
                             headers.gets("Return-Path") != null ? Address.parse(headers.gets("Return-Path")) : null;
-        this.envelopeTo   = headers.gets("Envelope-To") != null ? Address.parse(headers.gets("Envelope-To")) :
-                            headers.gets("To") != null ? Address.parse(headers.gets("To")) : null;
-        this.envelopeFrom = headers.gets("Return-Path") != null ? Address.parse(headers.gets("Return-Path")) :
-                            headers.gets("From") != null ? Address.parse(headers.gets("From")) : null;
+        this.envelopeTo   = headers.gets("Envelope-To") != null ? Address.parse(headers.gets("Envelope-To")) : null;
+        this.envelopeFrom = headers.gets("Return-Path") != null ? Address.parse(headers.gets("Return-Path")) : null;
         this.replyto      = headers.gets("Reply-To") == null ? null : Address.parse(headers.gets("Reply-To"));
         this.subject      = headers.gets("Subject");
         this.messageid    = headers.gets("Message-Id");
         this.cc           = Address.list(headers.gets("Cc"));
         this.bcc          = Address.list(headers.gets("BCc"));
-        this.date         = headers.gets("Date") == null ? new Date() : parseDate(headers.gets("Date"));
+        this.date         = parseDate(headers.gets("Date")) == null ? new Date() : parseDate(headers.gets("Date"));
         this.arrival      = this.date; // FIXME wrong
     }