Index: src/main/java/org/apache/james/postage/smtpserver/SimpleSMTPServerConfiguration.java
===================================================================
--- src/main/java/org/apache/james/postage/smtpserver/SimpleSMTPServerConfiguration.java	(revision 423377)
+++ src/main/java/org/apache/james/postage/smtpserver/SimpleSMTPServerConfiguration.java	(working copy)
@@ -23,6 +23,8 @@
 import org.apache.james.smtpserver.HeloCmdHandler;
 import org.apache.james.smtpserver.EhloCmdHandler;
 import org.apache.james.smtpserver.AuthCmdHandler;
+import org.apache.james.smtpserver.NoopCmdHandler;
+import org.apache.james.smtpserver.SendMailHandler;
 import org.apache.james.smtpserver.VrfyCmdHandler;
 import org.apache.james.smtpserver.ExpnCmdHandler;
 import org.apache.james.smtpserver.MailCmdHandler;
@@ -43,7 +45,7 @@
         return defaultConfiguration;
     }
 
-    public static DefaultConfiguration createRemoteManagerHandlerChainConfiguration() {
+    public static DefaultConfiguration createHandlerChainConfiguration() {
         DefaultConfiguration handlerChainConfig = new DefaultConfiguration("handlerchain");
         handlerChainConfig.addChild(createCommandHandlerConfiguration("HELO", HeloCmdHandler.class));
         handlerChainConfig.addChild(createCommandHandlerConfiguration("EHLO", EhloCmdHandler.class));
@@ -56,6 +58,8 @@
         handlerChainConfig.addChild(createCommandHandlerConfiguration("RSET", RsetCmdHandler.class));
         handlerChainConfig.addChild(createCommandHandlerConfiguration("HELP", HelpCmdHandler.class));
         handlerChainConfig.addChild(createCommandHandlerConfiguration("QUIT", QuitCmdHandler.class));
+        handlerChainConfig.addChild(createCommandHandlerConfiguration("NOOP", NoopCmdHandler.class));
+        handlerChainConfig.addChild(createCommandHandlerConfiguration("Default SendMailHandler", SendMailHandler.class));
         return handlerChainConfig;
     }
 
@@ -107,7 +111,7 @@
         handlerConfig.addChild(getValuedConfiguration("maxmessagesize", "" + 0));
         handlerConfig.addChild(getValuedConfiguration("authRequired", m_authorizingMode));
 
-        handlerConfig.addChild(createRemoteManagerHandlerChainConfiguration());
+        handlerConfig.addChild(createHandlerChainConfiguration());
         addChild(handlerConfig);
     }