diff --git a/src/apps/mail/MailSupport.cpp b/src/apps/mail/MailSupport.cpp
index f73313bad8..ae51683ba9 100644
--- a/src/apps/mail/MailSupport.cpp
+++ b/src/apps/mail/MailSupport.cpp
@@ -88,7 +88,8 @@ int32 	gDictCount = 0;
 
 // int32			level = L_BEGINNER;
 
-const char* kSpamServerSignature = "application/x-vnd.agmsmith.spamdbm";
+const char* kSpamServerSignature =
+	"application/x-vnd.agmsmith.AGMSBayesianSpamServer";
 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 b8573c8487..81153ae322 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -2593,7 +2593,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("spamdbm");
+					path.Append("AGMSBayesianSpamServer");
 					if (!BEntry(path.Path()).Exists())
 						continue;
 					get_ref_for_path(path.Path(),&ref);