diff --git a/headers/os/mail/MailDaemon.h b/headers/os/mail/MailDaemon.h
index 66e8ccb02e..e2434d88c2 100644
--- a/headers/os/mail/MailDaemon.h
+++ b/headers/os/mail/MailDaemon.h
@@ -10,6 +10,11 @@
 #include <Messenger.h>
 
 
+enum {
+	B_MAIL_BODY_FETCHED = '_Mbf'
+};
+
+
 class BMailDaemon {
 public:
 								BMailDaemon();
diff --git a/headers/private/mail/MailPrivate.h b/headers/private/mail/MailPrivate.h
index 03bb2bc653..e30ff64090 100644
--- a/headers/private/mail/MailPrivate.h
+++ b/headers/private/mail/MailPrivate.h
@@ -26,7 +26,6 @@ const uint32 kMsgSetStatusWindowMode = 'shst';
 const uint32 kMsgCountNewMessages = 'mnum';
 const uint32 kMsgMarkMessageAsRead = 'mmar';
 const uint32 kMsgFetchBody = 'mfeb';
-const uint32 kMsgBodyFetched = 'mbfe';
 const uint32 kMsgSyncMessages = '&SyM';
 
 
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index f30bf34625..3555b7060a 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -832,7 +832,7 @@ TMailWindow::MarkMessageRead(entry_ref* message, read_flags flag)
 	// preserve the read position in the node attribute
 	PreserveReadingPos(true);
 
-	BMailDaemon::MarkAsRead(account, *message, flag);
+	BMailDaemon().MarkAsRead(account, *message, flag);
 }
 
 
@@ -957,7 +957,7 @@ TMailWindow::MessageReceived(BMessage *msg)
 {
 	bool wasReadMsg = false;
 	switch (msg->what) {
-		case kMsgBodyFetched:
+		case B_MAIL_BODY_FETCHED:
 		{
 			status_t status = msg->FindInt32("status");
 			if (status != B_OK) {
@@ -2474,9 +2474,10 @@ TMailWindow::Send(bool now)
 			int32 start = alert->Go();
 
 			if (start == 0) {
-				result = be_roster->Launch("application/x-vnd.Be-POST");
+				BMailDaemon daemon;
+				result = daemon.Launch();
 				if (result == B_OK) {
-					BMailDaemon::SendQueuedMail();
+					daemon.SendQueuedMail();
 				} else {
 					errorMessage
 						<< B_TRANSLATE("The mail_daemon could not be "
@@ -2837,7 +2838,7 @@ TMailWindow::OpenMessage(const entry_ref *ref, uint32 characterSetForDecoding)
 
 	if (strcmp(mimeType, B_PARTIAL_MAIL_TYPE) == 0) {
 		BMessenger listener(this);
-		BMailDaemon::FetchBody(*ref, &listener);
+		BMailDaemon().FetchBody(*ref, &listener);
 		fileInfo.GetType(mimeType);
 		_SetDownloading(true);
 	} else
diff --git a/src/kits/mail/MailProtocol.cpp b/src/kits/mail/MailProtocol.cpp
index 4229c5d5d3..a0824009b2 100644
--- a/src/kits/mail/MailProtocol.cpp
+++ b/src/kits/mail/MailProtocol.cpp
@@ -377,7 +377,7 @@ BInboundMailProtocol::MessageReceived(BMessage* message)
 			if (message->FindMessenger("target", &target) != B_OK)
 				break;
 
-			BMessage message(kMsgBodyFetched);
+			BMessage message(B_MAIL_BODY_FETCHED);
 			message.AddInt32("status", status);
 			message.AddRef("ref", &ref);
 			target.SendMessage(&message);