diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index c60d3f54a9..ac10826bce 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -168,7 +168,10 @@ BMessage::BMessage(BMessage *a_message)
 //------------------------------------------------------------------------------
 BMessage::~BMessage()
 {
-	// ToDo: send outstanding reply!
+	if (IsSourceWaiting())
+	{
+		SendReply(B_NO_REPLY);
+	}
 	delete fBody;
 }
 //------------------------------------------------------------------------------