diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 6094129c17..e649289f6a 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -38,8 +38,8 @@ BEOS_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2
 	printf profile ps ptx pwd query quit rc readlink release renice rescan rlog
 	rm rmattr rmindex rmdir roster route
 	safemode screen_blanker screenmode sed setdecor settype setversion setvolume
-	seq sh sha1sum shar shred shuf shutdown sleep sort split stat strace stty su
-	sum sync sysinfo
+	seq sh sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace
+	stty su sum sync sysinfo
 	tac tail tar tcpdump tcptester tee telnet telnetd test top touch tput tr
 	traceroute translate true tsort tty
 	uname unchop unexpand unmount uniq unrar unshar unzip unzipsfx <bin>updatedb
diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp
index 4699e391f2..3dba3a8b26 100644
--- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp
@@ -126,7 +126,7 @@ static const char *kAGMSBayesBeepGenuineName = "SpamFilter-Genuine";
 static const char *kAGMSBayesBeepSpamName = "SpamFilter-Spam";
 static const char *kAGMSBayesBeepUncertainName = "SpamFilter-Uncertain";
 
-static const char *kServerSignature = "application/x-vnd.agmsmith.AGMSBayesianSpamServer";
+static const char *kServerSignature = "application/x-vnd.agmsmith.spamdbm";
 
 
 AGMSBayesianSpamFilter::AGMSBayesianSpamFilter (BMessage *settings)
@@ -237,7 +237,7 @@ AGMSBayesianSpamFilter::ProcessMailMessage (
 				directory_which places[] = {B_COMMON_BIN_DIRECTORY,B_BEOS_BIN_DIRECTORY};
 				for (int32 i = 0; i < 2; i++) {
 					find_directory(places[i],&path);
-					path.Append("AGMSBayesianSpamServer");
+					path.Append("spamdbm");
 					if (!BEntry(path.Path()).Exists())
 						continue;
 					get_ref_for_path(path.Path(),&ref);
diff --git a/src/apps/mail/MailSupport.cpp b/src/apps/mail/MailSupport.cpp
index ae51683ba9..57c8beb84c 100644
--- a/src/apps/mail/MailSupport.cpp
+++ b/src/apps/mail/MailSupport.cpp
@@ -89,7 +89,7 @@ int32 	gDictCount = 0;
 // int32			level = L_BEGINNER;
 
 const char* kSpamServerSignature =
-	"application/x-vnd.agmsmith.AGMSBayesianSpamServer";
+	"application/x-vnd.agmsmith.spamdbm";
 const char* kDraftPath = "mail/draft";
 const char* kDraftType = "text/x-vnd.Be-MailDraft";
 const char* kMailFolder = "mail";
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index f52b0a5952..43f696bc41 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -2591,7 +2591,7 @@ TMailWindow::TrainMessageAs(const char *CommandWord)
 				directory_which places[] = {B_COMMON_BIN_DIRECTORY,B_BEOS_BIN_DIRECTORY};
 				for (int32 i = 0; i < 2; i++) {
 					find_directory(places[i],&path);
-					path.Append("AGMSBayesianSpamServer");
+					path.Append("spamdbm");
 					if (!BEntry(path.Path()).Exists())
 						continue;
 					get_ref_for_path(path.Path(),&ref);
diff --git a/src/bin/bemail_utils/spamdbm.cpp b/src/bin/bemail_utils/spamdbm.cpp
index 85b067f256..089bc6ff88 100644
--- a/src/bin/bemail_utils/spamdbm.cpp
+++ b/src/bin/bemail_utils/spamdbm.cpp
@@ -544,11 +544,11 @@ directory, available from http://sourceforge.net/projects/bemaildaemon/ */
  */
 
 static float g_MarginBetweenControls; /* Space of a letter "M" between them. */
-//static float g_LineOfTextHeight;      /* Height of text the current font. */
+static float g_LineOfTextHeight;      /* Height of text the current font. */
 static float g_StringViewHeight;      /* Height of a string view text box. */
 static float g_ButtonHeight;          /* How many pixels tall buttons are. */
 static float g_CheckBoxHeight;        /* Same for check boxes. */
-//static float g_RadioButtonHeight;     /* Also for radio buttons. */
+static float g_RadioButtonHeight;     /* Also for radio buttons. */
 static float g_PopUpMenuHeight;       /* Again for pop-up menus. */
 static float g_TextBoxHeight;         /* Ditto for editable text controls. */
 
@@ -1689,7 +1689,7 @@ ostream& PrintUsage (ostream& OutputStream)
         OutputStream << "Buggy Command: " << PropInfoPntr->name << endl;
         break;
     }
-    WrapTextToStream (OutputStream, PropInfoPntr->usage);
+    WrapTextToStream (OutputStream, (char *)PropInfoPntr->usage);
     OutputStream << endl;
   }
 
@@ -4762,8 +4762,6 @@ status_t ABSApp::PurgeOldWords (char *ErrorMessage)
 
 void ABSApp::ReadyToRun ()
 {
-
-#if 0
   DatabaseWindow *DatabaseWindowPntr;
   float           JunkFloat;
   BButton        *TempButtonPntr;
@@ -4914,14 +4912,12 @@ void ABSApp::ReadyToRun ()
       DisplayErrorMessage ("Unable to create window.");
       g_QuitCountdown = 0;
     }
-    else
+    else {
       DatabaseWindowPntr->Show (); /* Starts the window's message loop. */
+	  DatabaseWindowPntr->Minimize (g_ServerMode);
+    }
   }
 
-#endif 	// end all the unnecessary #if 0'ed code
-
-  SetPulseRate (500000);
-
   g_AppReadyToRunCompleted = true;
 }
 
@@ -7072,14 +7068,6 @@ DatabaseWindow::DatabaseWindow ()
     goto ErrorExit;
   AddChild (m_WordsViewPntr);
 
-
-  /* Minimize the window if we are starting up in server mode.  This is done
-  before the window is open so it doesn't flash onto the screen, and possibly
-  steal a keystroke or two.  The ControlsView will further update the minimize
-  mode when it detects changes in the server mode. */
-
-  Minimize (g_ServerMode);
-
   return;
 
 ErrorExit: