From 8ebbaeed82f6ac07eec72cdd2016bb5510589619 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 12 Sep 2013 13:57:38 +0000
Subject: [PATCH] * eMail: fix problem for folder preferences did not overrule
 folders set by getSpecialUseFolders

---
 felamimail/inc/class.bofelamimail.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/felamimail/inc/class.bofelamimail.inc.php b/felamimail/inc/class.bofelamimail.inc.php
index 11d331aba0..08a367b27b 100644
--- a/felamimail/inc/class.bofelamimail.inc.php
+++ b/felamimail/inc/class.bofelamimail.inc.php
@@ -2737,8 +2737,13 @@
 			}
 			if (is_null(self::$specialUseFolders) || empty(self::$specialUseFolders)) self::$specialUseFolders = $this->getSpecialUseFolders();
 
-			//highest precedence
+			//highest precedence (user defined profiles, or set by specialUseFolder routine)
 			$_folderName = $this->mailPreferences->ic_server[$this->profileID]->$types[$_type]['profileKey'];
+			// check if there is a pref, over- writing/ruling the previous (Folder MUST exist)
+			if (!empty($_folderName) && (!empty($this->mailPreferences->preferences[$types[$_type]['prefName']]) &&
+				$this->mailPreferences->preferences[$types[$_type]['prefName']]!='none' &&
+				$_folder != $this->mailPreferences->preferences[$types[$_type]['prefName']] &&
+				self::folderExists($this->mailPreferences->preferences[$types[$_type]['prefName']],true))) $_folderName = false;
 			//check prefs next
 			if (empty($_folderName)) $_folderName = $this->mailPreferences->preferences[$types[$_type]['prefName']];
 			// does the folder exist???