diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index b870ef8359..66d09814a6 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -1516,12 +1516,13 @@ TMailWindow::MessageReceived(BMessage *msg)
 						window->Activate();
 
 						//fSent = true;
-						BMessage msg(B_CLOSE_REQUESTED);
-						PostMessage(&msg);
+						PostMessage(B_CLOSE_REQUESTED);
 					}
 
 					SetTrackerSelectionToCurrent();
 				} else {
+					if (wasReadMsg)
+						PostMessage(B_CLOSE_REQUESTED);
 					beep();
 				}
 			}