From f2cfd943912020e8e133ff01dda798ced72df946 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Mon, 1 Oct 2018 11:16:17 -0600
Subject: [PATCH] Add a keep emails flag (default true), set to false to skip
 saving merged emails to sent folder

---
 api/src/Storage/Merge.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 2e74b100e0..c9b3d60307 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -107,6 +107,14 @@ abstract class Merge
 	 */
 	public $report_memory_usage = false;
 
+	/**
+	 * Save sent emails.  Used when merge template is an email.  Default is true,
+	 * to save sent emails in your sent folder.
+	 *
+	 * @var boolean
+	 */
+	public $keep_emails = true;
+
 	/**
 	 * Constructor
 	 */
@@ -1656,7 +1664,7 @@ abstract class Merge
 				$mail_bo->openConnection();
 				try
 				{
-					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder='');
+					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder=($this->keep_emails ? '' : FALSE));
 				}
 				catch (Api\Exception\WrongUserinput $e)
 				{