Index: /home/maurer/stuff/workspace/james-dev/src/java/org/apache/james/smtpserver/DataCmdHandler.java
===================================================================
--- /home/maurer/stuff/workspace/james-dev/src/java/org/apache/james/smtpserver/DataCmdHandler.java	(revision 390102)
+++ /home/maurer/stuff/workspace/james-dev/src/java/org/apache/james/smtpserver/DataCmdHandler.java	(working copy)
@@ -63,6 +63,7 @@
     private final static String SENDER = "SENDER_ADDRESS";     // Sender's email address
     private final static String MESG_FAILED = "MESG_FAILED";   // Message failed flag
     private final static String RCPT_LIST = "RCPT_LIST";   // The message recipients
+    private final static String RCPTCOUNT = "RCPT_COUNT";
 
     /**
      * The mail attribute holding the SMTP AUTH user name, if any.
@@ -175,6 +176,9 @@
                         // Ignore close exception
                     }
                     msgIn = null;
+                    
+                    // reset the rcptcount for maxRcpt check
+                    session.getState().put(RCPTCOUNT,"0");
                 }
             }
         }