- ret = insert_message (config, notmuch, STDIN_FILENO, maildir, tag_ops,
- synchronize_flags);
+ /* Write the message to the Maildir new directory. */
+ if (! write_message (config, STDIN_FILENO, maildir, &newpath)) {
+ notmuch_database_destroy (notmuch);
+ return EXIT_FAILURE;
+ }
+
+ /* Add the message to the index.
+ * Even if adding the message to the notmuch database fails,
+ * the message is on disk and we consider the delivery completed. */
+ add_file_to_database (notmuch, newpath, tag_ops,
+ synchronize_flags);