--- a/src/lib-storage/mail-storage.c	Mon Feb 13 20:23:49 2017 +0200
+++ b/src/lib-storage/mail-storage.c	Thu Feb 09 18:46:14 2017 +0200
@@ -2151,6 +2151,11 @@
 	ctx->dest_mail_external = TRUE;
 }
 
+struct mail *mailbox_save_get_dest_mail(struct mail_save_context *ctx)
+{
+	return ctx->dest_mail;
+}
+
 int mailbox_save_begin(struct mail_save_context **ctx, struct istream *input)
 {
 	struct mailbox *box = (*ctx)->transaction->box;

--- a/src/lib-storage/mail-storage.h	Mon Feb 13 20:23:49 2017 +0200
+++ b/src/lib-storage/mail-storage.h	Thu Feb 09 18:46:14 2017 +0200
@@ -756,12 +756,11 @@
    of the mailbox. Not all backends support this. */
 void mailbox_save_set_pop3_order(struct mail_save_context *ctx,
 				 unsigned int order);
-/* If dest_mail is set, the saved message can be accessed using it. Note that
-   setting it may require mailbox syncing, so don't set it unless you need
-   it. Also you shouldn't try to access it before mailbox_save_finish() is
-   called. */
+/* FIXME: Remove in v2.3. Obsolete - use mailbox_save_get_dest_mail() instead */
 void mailbox_save_set_dest_mail(struct mail_save_context *ctx,
 				struct mail *mail);
+/* Returns the destination mail */
+struct mail *mailbox_save_get_dest_mail(struct mail_save_context *ctx);
 /* Begin saving the message. All mail_save_set_*() calls must have been called
    before this function. If the save initialization fails, the context is freed
    and -1 is returned. After beginning the save you should keep calling