massive robustness overhaul

[org.ibex.mail.git] / src / org / ibex / mail / target / Script.java

diff --git a/src/org/ibex/mail/target/Script.java b/src/org/ibex/mail/target/Script.java
index 3a87567..912c732 100644 (file)
--- a/src/org/ibex/mail/target/Script.java
+++ b/src/org/ibex/mail/target/Script.java
@@ -153,9 +153,11 @@ public class Script extends Target {
                     }
                     if (envelopeTo == null) envelopeTo = to;
                     if (envelopeFrom == null) envelopeFrom = from;
-                    Message message = Message.newMessage(new org.ibex.io.Stream(headers.toString() + "\r\n" + body),
-                                                         envelopeFrom,
-                                                         envelopeTo);
+                    Message message =
+                        Message.newMessage(new org.ibex.io.Fountain.StringFountain(headers.toString() + "\r\n" + body),
+                                           envelopeFrom,
+                                           envelopeTo
+                                           );
                     //org.ibex.mail.protocol.SMTP.Outgoing.accept(message);
                     boolean ok = org.ibex.mail.protocol.SMTP.Outgoing.attempt(message);
                     if (!ok) throw new JSExn("SMTP server rejected message");
@@ -163,7 +165,7 @@ public class Script extends Target {
                 }
                 if (name.equals("mail.forward2") || name.equals("forward2")) {
                     try {
-                        Message m2 = Message.newMessage(new org.ibex.io.Stream(m.toString()),
+                        Message m2 = Message.newMessage(new org.ibex.io.Fountain.StringFountain(m.toString()),
                                                         m.envelopeFrom,
                                                         new Address(JSU.toString(a)));
                         org.ibex.mail.protocol.SMTP.Outgoing.accept(m2);
@@ -176,9 +178,7 @@ public class Script extends Target {
                 if (name.equals("mail.forward") || name.equals("forward")) { return new Target() {
                         public void accept(Message m) throws MailException {
                             try {
-                                Message m2 = Message.newMessage(new org.ibex.io.Stream(m.toString()),
-                                                                m.envelopeFrom,
-                                                                new Address(JSU.toString(a)));
+                                Message m2 = Message.newMessage(m, m.envelopeFrom, new Address(JSU.toString(a)));
                                 org.ibex.mail.protocol.SMTP.Outgoing.accept(m2);
                             } catch (Exception e) {
                                 throw new MailException(e.toString());