diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index 501cc0e051..4df23757c2 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -2787,6 +2787,8 @@ TMailWindow::SetTitleForMessage()
 status_t
 TMailWindow::OpenMessage(const entry_ref *ref, uint32 characterSetForDecoding)
 {
+	if (ref == NULL)
+		return B_ERROR;
 	//
 	//	Set some references to the email file
 	//