diff --git a/src/kits/app/LinkSender.cpp b/src/kits/app/LinkSender.cpp
index c1f40f625e..8d3dd91f74 100644
--- a/src/kits/app/LinkSender.cpp
+++ b/src/kits/app/LinkSender.cpp
@@ -64,11 +64,13 @@ status_t
 LinkSender::StartMessage(int32 code, size_t minSize)
 {
 	// end previous message
-	if (EndMessage() < B_OK)	
+	if (EndMessage() < B_OK)
 		CancelMessage();
 
-	if (minSize > kMaxBufferSize - sizeof(message_header))
-		return fCurrentStatus = B_BUFFER_OVERFLOW;
+	if (minSize >= kMaxBufferSize) {
+		// we will handle this case in Attach, using an area
+		minSize = sizeof(area_id);
+	}
 
 	minSize += sizeof(message_header);