From 64dd615257be5f31389169bd8b25d621e11eb0db Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 20 Sep 2018 15:25:11 +0200
Subject: [PATCH] * Mail: fix deleting mails from draft folder does not respect
 "move to trash" in delete message preference

---
 api/src/Mail.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/api/src/Mail.php b/api/src/Mail.php
index bef9e9d4f7..2ff1846576 100644
--- a/api/src/Mail.php
+++ b/api/src/Mail.php
@@ -3923,8 +3923,7 @@ class Mail
 		$trashFolder    = $this->getTrashFolder();
 		$draftFolder	= $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
 		$templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder'];
-		if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
-		   (strtolower($_folder) == strtolower($draftFolder))) {
+		if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash")) {
 			$deleteOptions = "remove_immediately";
 		}
 		if($this->icServer->getCurrentMailbox() != $_folder) {