massive refactoring of Headers class

[org.ibex.mail.git] / src / org / ibex / mail / SMTP.java

diff --git a/src/org/ibex/mail/SMTP.java b/src/org/ibex/mail/SMTP.java
index a23c7de..f8bcf0b 100644 (file)
--- a/src/org/ibex/mail/SMTP.java
+++ b/src/org/ibex/mail/SMTP.java
@@ -349,9 +349,11 @@ public class SMTP {
                 conn.println("RCPT TO:<"   + m.envelopeTo.toString()+">");  check(conn.readln(), conn);
                 conn.println("DATA");                                       check(conn.readln(), conn);
 
-                Headers head = m.headers;
-                head = head.remove("return-path");
-                head = head.remove("bcc");
+                Headers head = new Headers(m.headers,
+                                           new String[] {
+                                               "return-path", null,
+                                               "bcc", null
+                                           });
                 Stream stream = head.getStream();
                 for(String s = stream.readln(); s!=null; s=stream.readln()) {
                     if (s.startsWith(".")) conn.print(".");