Index: /home/maurer/stuff/workspace/james-trunk/src/conf/james-config.xml
===================================================================
--- /home/maurer/stuff/workspace/james-trunk/src/conf/james-config.xml	(revision 414813)
+++ /home/maurer/stuff/workspace/james-trunk/src/conf/james-config.xml	(working copy)
@@ -765,7 +765,7 @@
       <maxcachesize>50000</maxcachesize>
    </dnsserver>
 
-   <remotemanager>
+   <remotemanager enabled="true">
       <port>4555</port>
       <!--  Uncomment this if you want to bind to a specific inetaddress -->
       <!--
Index: /home/maurer/stuff/workspace/james-trunk/src/java/org/apache/james/remotemanager/RemoteManager.java
===================================================================
--- /home/maurer/stuff/workspace/james-trunk/src/java/org/apache/james/remotemanager/RemoteManager.java	(revision 413584)
+++ /home/maurer/stuff/workspace/james-trunk/src/java/org/apache/james/remotemanager/RemoteManager.java	(working copy)
@@ -102,7 +102,13 @@
         throws ConfigurationException {
 
         super.configure(configuration);
-        if (isEnabled()) {
+        
+        boolean enabled = configuration.getAttributeAsBoolean("enabled", true);
+        
+        if (!enabled) {
+            getLogger().info(getServiceType() + " disabled by configuration");
+            return;
+        } else {
             Configuration handlerConfiguration = configuration.getChild("handler");
             Configuration admin = handlerConfiguration.getChild( "administrator_accounts" );
             Configuration[] accounts = admin.getChildren( "account" );