X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage-file.c;h=a41d9ad2a719df507d3091316d594bc38b3e4fc5;hp=eda1b748e2022d73d2d8737f04151f342e0787ad;hb=1e5b4b72c928d2ed8243be2b4edc20e60e9bd158;hpb=df8885f62c13f77b2b16cbb211e3a727945870b0

diff --git a/lib/message-file.c b/lib/message-file.c
index eda1b748..a41d9ad2 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -170,25 +170,12 @@ _notmuch_message_file_parse (notmuch_message_file_t *message)
 	goto DONE;
     }
 
-    if (is_mbox) {
-	if (! g_mime_parser_eos (parser)) {
-	    /* This is a multi-message mbox. */
-	    status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
-	    goto DONE;
-	}
+    if (is_mbox && ! g_mime_parser_eos (parser)) {
 	/*
-	 * For historical reasons, we support single-message mboxes,
-	 * but this behavior is likely to change in the future, so
-	 * warn.
+	 * This is a multi-message mbox. (For historical reasons, we
+	 * do support single-message mboxes.)
 	 */
-	static notmuch_bool_t mbox_warning = FALSE;
-	if (! mbox_warning) {
-	    mbox_warning = TRUE;
-	    fprintf (stderr, "\
-Warning: %s is an mbox containing a single message,\n\
-likely caused by misconfigured mail delivery.  Support for single-message\n\
-mboxes is deprecated and may be removed in the future.\n", message->filename);
-	}
+	status = NOTMUCH_STATUS_FILE_NOT_EMAIL;
     }
 
   DONE: