diff --git a/src/servers/mail/MailDaemonApplication.cpp b/src/servers/mail/MailDaemonApplication.cpp
index 5db9cf651c..76c516b141 100644
--- a/src/servers/mail/MailDaemonApplication.cpp
+++ b/src/servers/mail/MailDaemonApplication.cpp
@@ -201,6 +201,18 @@ MailDaemonApplication::ReadyToRun()
 	fNotification = new BNotification(B_INFORMATION_NOTIFICATION);
 	fNotification->SetGroup(B_TRANSLATE("Mail status"));
 	fNotification->SetMessageID("daemon_status");
+
+	BPath path;
+	if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
+		path.Append("Mail/New E-mail");
+
+		entry_ref ref;
+		if (get_ref_for_path(path.Path(), &ref) == B_OK) {
+			fNotification->SetOnClickApp("application/x-vnd.Be-TRAK");
+			fNotification->AddOnClickRef(&ref);
+		}
+	}
+
 	_UpdateNewMessagesNotification();
 
 	app_info info;