From bdcbce7f68b2417aff65d989eaadce32421e0b77 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 22 May 2009 08:57:00 +0000
Subject: [PATCH] fix for bug #2086  Trunk/1.6  Users cant define their own
 identities...

---
 felamimail/inc/class.bopreferences.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/felamimail/inc/class.bopreferences.inc.php b/felamimail/inc/class.bopreferences.inc.php
index e79e7a805e..f012f8c9cc 100644
--- a/felamimail/inc/class.bopreferences.inc.php
+++ b/felamimail/inc/class.bopreferences.inc.php
@@ -149,7 +149,7 @@
 			if(!is_a($profileData, 'ea_preferences') || !is_a($profileData->ic_server[0], 'defaultimap')) {
 				return false;
 			}
-			if($profileData->userDefinedAccounts) {
+			if($profileData->userDefinedAccounts || $profileData->userDefinedIdentities) {
 				// get user defined accounts
 				$allAccountData = $this->getAllAccountData($profileData);
 				if ($allAccountData) {
@@ -169,7 +169,6 @@
 				$this->profileData = $this->sessionData['profileData'];
 			}
 			if(!is_a($this->profileData,'ea_preferences')) {
-
 				$imapServerTypes	= $this->boemailadmin->getIMAPServerTypes();
 				$profileData		= $this->boemailadmin->getUserProfile('felamimail');
 
@@ -196,6 +195,8 @@
 							$rememberID = $accountData['identity']->id;
 						}
 					}
+				}
+				if($profileData->userDefinedIdentities && $GLOBALS['egw_info']['user']['apps']['felamimail']) {
 					$allUserIdentities = $this->getUserDefinedIdentities();
 					if (is_array($allUserIdentities)) {
 						$i=count($allUserIdentities);