massive refactoring of Headers class

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

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index 7036533..9d91a18 100644 (file)
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -163,8 +163,7 @@ public class Message extends MIME.Part {
         if (envelopeFrom==null || envelopeFrom.toString().equals("")) return null;
 
         Log.warn(Message.class, "bouncing message due to: " + reason);
-        Headers h = new Headers.Original(headers.getStream());
-        h = h.set(new String[] {
+        Headers h = new Headers(headers, new String[] {
             "Envelope-To", envelopeFrom.toString(),
             "Return-Path", "<>",
             "From",        "MAILER-DAEMON <>",
@@ -185,7 +184,7 @@ public class Message extends MIME.Part {
             "\r\n";
 
         try {
-            return newMessage(new Fountain.Concatenate(new Fountain.StringFountain(h.getString()+"\r\n"+error), getBody()));
+            return newMessage(Fountain.Util.concat(h, Fountain.Util.create(error), getBody()));
         } catch (Message.Malformed e) {
             Log.error(this, "caught Message.Malformed in Message.bounce(); this should never happen");
             Log.error(this, e);