dealt with misparsed envelopes

darcs-hash:20040707085226-5007d-475b3e1eb3cf9346d2897836bda538197a62c341.gz

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index 536944e..0406cf6 100644 (file)
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -138,9 +138,11 @@ public class Message extends org.ibex.js.JSReflection {
             } else if (key.startsWith("Return-Path")) {
                 stream.unread(s); traces.addElement(new Trace(stream));
             } else if (key.equals("X-org.ibex.mail.headers.envelope.From")) {
-                if (envelopeFrom == null) envelopeFrom = new Address(val);
+                try { if (envelopeFrom == null) envelopeFrom = new Address(val);
+                } catch (Address.Malformed a) { Log.warn(this, a); }
             } else if (key.equals("X-org.ibex.mail.headers.envelope.To")) {
-                if (envelopeTo == null) envelopeTo = new Address(val);
+                try {if (envelopeTo == null) envelopeTo = new Address(val);
+                } catch (Address.Malformed a) { Log.warn(this, a); }
             } else {
                 // just append it to the previous one; valid for Comments/Keywords
                 if (headers.get(key) != null) val = headers.get(key) + " " + val;