UNDO: ability to send with empty envelopes

darcs-hash:20040707085409-5007d-82938de56e0b4a11db8ce38f8053d870d7a0db6b.gz

diff --git a/src/org/ibex/mail/protocol/SMTP.java b/src/org/ibex/mail/protocol/SMTP.java
index 31f9e59..636bc5d 100644 (file)
--- a/src/org/ibex/mail/protocol/SMTP.java
+++ b/src/org/ibex/mail/protocol/SMTP.java
@@ -129,8 +129,8 @@ public class SMTP {
                 Log.info(SMTP.Outgoing.class, "connected");
                 check(conn.readln());  // banner
                 conn.println("HELO " + conn.vhost);            check(conn.readln());
-                conn.println("MAIL FROM:" + (m.envelopeFrom==null?"<>":m.envelopeFrom.toString()));  check(conn.readln());
-                conn.println("RCPT TO:"   + (m.envelopeTo==null?"<>":m.envelopeTo.toString()));    check(conn.readln());
+                conn.println("MAIL FROM: " + m.envelopeFrom.user + "@" + m.envelopeFrom.host);  check(conn.readln());
+                conn.println("RCPT TO: "   + m.envelopeTo.user + "@" + m.envelopeTo.host);      check(conn.readln());
                 conn.println("DATA");                          check(conn.readln());
                 conn.println(m.toString());
                 conn.println(".");