From b2e07c8ae25ec11b8a1324eca6c28097cbfd7464 Mon Sep 17 00:00:00 2001
From: adam <adam@megacz.com>
Date: Sat, 17 Mar 2007 09:00:01 +0000
Subject: [PATCH] change some commenting in Message

darcs-hash:20070317090001-5007d-bc9d583a578ca424d7530332d6b1b61cddf005d3.gz
---
 src/org/ibex/mail/Message.java |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index f52a6f2..7036533 100644
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -44,12 +44,13 @@ public class Message extends MIME.Part {
 
     public static Message newMessage(Fountain in) throws Malformed { return new Message(in); }
 
+    /*
     public Message reply(Fountain in, Address from, boolean includeReInSubject) throws Malformed {
-        /*
 	Address to = null;
 	if (to==null) to = Address.parse(headers.get("reply-to"));
 	if (to==null) to = Address.parse(headers.get("from"));
 	if (to==null) to = envelopeFrom;
+        if (to==null) throw new Malformed("cannot reply to a message without a return address");
 	Message ret = newMessage(in, from, to);
 	ret.headers.put("In-Reply-To", messageid);
 	String references = headers.get("references");
@@ -57,10 +58,8 @@ public class Message extends MIME.Part {
 	if (includeReInSubject && subject!=null && !subject.toLowerCase().trim().startsWith("re:"))
 	    headers.put("subject", "Re: "+subject);
 	return ret;
-        */
-        // FIXME
-        return null;
     }
+    */
 
     // FIXME
     //public static Message newMessage(Headers headers, Fountain body, Address from, Address to) throws Malformed {
@@ -134,6 +133,7 @@ public class Message extends MIME.Part {
     }
     */
 
+
     // Helpers /////////////////////////////////////////////////////////////////////////////
 
     // http://www.jwz.org/doc/mid.html
@@ -173,6 +173,7 @@ public class Message extends MIME.Part {
         });
 
         String error =
+            "\r\n"+
             "Hi. This is the Ibex Mail Server.  I'm afraid I wasn't able to deliver\r\n"+
             "your message to the following addresses. This is a permanent error;\r\n"+
             "I've given up.  Sorry it didn't work out\r\n."+
-- 
1.7.10.4