Index: org/apache/james/smtpserver/SMTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPHandler.java,v
retrieving revision 1.35
diff -w -r1.35 SMTPHandler.java
172,176d171
<      * A Reader wrapper for the incoming stream of bytes coming from the socket.
<      */
<     private BufferedReader inReader;
< 
<     /**
287,290d281
<             // An ASCII encoding can be used because all transmissions other
<             // that those in the DATA command are guaranteed
<             // to be ASCII
<             inReader = new BufferedReader(new InputStreamReader(in, "ASCII"), 512);
394d384
<         inReader = null;
483c473,497
<         return inReader.readLine().trim();
---
>         //Read through for \r or \n
>         ByteArrayOutputStream bout = new ByteArrayOutputStream();
>         byte b = -1;
>         while (true) {
>             in.mark(1);
>             b = (byte) in.read();
>             if (b == 13) {
>                 //We're done, but we want to see if \n is next
>                 b = (byte) in.read();
>                 if (b != 10) {
>                     in.reset();
>                 }
>                 break;
>             } else if (b == 10) {
>                 //We're done
>                 break;
>             } else if (b == -1) {
>                 break;
>             }
>             bout.write(b);
>         }
>         // An ASCII encoding can be used because all transmissions other
>         // that those in the DATA command are guaranteed
>         // to be ASCII
>         return bout.toString("ASCII").trim();