diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
index fe1212bfb1..721e7aafa7 100644
--- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
@@ -139,7 +139,7 @@ AGMSBayesianSpamFilterConfig::AGMSBayesianSpamFilterConfig (BMessage *settings)
 		fGenuineCutoffRatioTextBoxPntr (NULL),
 		fNoWordsMeansSpam (true),
 		fNoWordsMeansSpamCheckBoxPntr (NULL),
-		fQuitServerWhenFinished (false),
+		fQuitServerWhenFinished (true),
 		fQuitServerWhenFinishedCheckBoxPntr (NULL),
 		fServerSettingsButtonPntr (NULL),
 		fSpamCutoffRatio (0.99f),
@@ -263,7 +263,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow ()
 
 	// Button for editing the server settings.
 
-	fServerSettingsButtonPntr = new BButton (
+/*	fServerSettingsButtonPntr = new BButton (
 		tempRect,
 		"serverSettings",
 		"Advanced Server Settings…",
@@ -276,6 +276,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow ()
 	tempRect.top = fServerSettingsButtonPntr->Frame().bottom + 1;
 	tempRect.bottom = tempRect.top + 20;
 
+
     // Checkbox for closing the server when done.
 
 	fQuitServerWhenFinishedCheckBoxPntr = new BCheckBox (
@@ -291,6 +292,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow ()
 	tempRect = Bounds ();
 	tempRect.top = fQuitServerWhenFinishedCheckBoxPntr->Frame().bottom + 1;
 	tempRect.bottom = tempRect.top + 20;
+*/
 }