diff --git a/src/kits/mail/MailDaemon.cpp b/src/kits/mail/MailDaemon.cpp
index 21722feb26..a1778c0ff8 100644
--- a/src/kits/mail/MailDaemon.cpp
+++ b/src/kits/mail/MailDaemon.cpp
@@ -135,5 +135,9 @@ BMailDaemon::Quit()
 status_t
 BMailDaemon::Launch()
 {
-	return be_roster->Launch(B_MAIL_DAEMON_SIGNATURE);
+	status_t status = be_roster->Launch(B_MAIL_DAEMON_SIGNATURE);
+	if (status == B_OK)
+		fDaemon = BMessenger(B_MAIL_DAEMON_SIGNATURE);
+
+	return status;
 }