diff --git a/felamimail/inc/class.bocompose.inc.php b/felamimail/inc/class.bocompose.inc.php
index 472aa5bf2d..560c695a8e 100644
--- a/felamimail/inc/class.bocompose.inc.php
+++ b/felamimail/inc/class.bocompose.inc.php
@@ -692,7 +692,7 @@
 		{
 			$bofelamimail	= $this->bofelamimail;
 			$_mailObject->PluginDir = EGW_SERVER_ROOT."/phpgwapi/inc/";
-			$activeMailProfile = $this->preferences->getIdentity($this->bofelamimail->profileID);
+			$activeMailProfile = $this->preferences->getIdentity($this->bofelamimail->profileID, true);
 			$_mailObject->IsSMTP();
 			$_mailObject->CharSet	= $this->displayCharset;
 			// you need to set the sender, if you work with different identities, since most smtp servers, dont allow
diff --git a/felamimail/inc/class.felamimail_bo.inc.php b/felamimail/inc/class.felamimail_bo.inc.php
index 7f797cb1cf..dd9c78690b 100644
--- a/felamimail/inc/class.felamimail_bo.inc.php
+++ b/felamimail/inc/class.felamimail_bo.inc.php
@@ -4190,7 +4190,7 @@ class felamimail_bo
 							//error_log(__METHOD__.__LINE__.' ID:'.$val.' Data:'.array2string($contact));
 							$email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
 							$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
-							$activeMailProfile = $this->mailPreferences->getIdentity($this->profileID);
+							$activeMailProfile = $this->mailPreferences->getIdentity($this->profileID, true);
 							//error_log(__METHOD__.__LINE__.array2string($activeMailProfile));
 							$mailObject->From = $activeMailProfile->emailAddress;
 							//$mailObject->From  = $_identity->emailAddress;
diff --git a/felamimail/inc/class.felamimail_hooks.inc.php b/felamimail/inc/class.felamimail_hooks.inc.php
index 18c579b571..2bcfbdac05 100644
--- a/felamimail/inc/class.felamimail_hooks.inc.php
+++ b/felamimail/inc/class.felamimail_hooks.inc.php
@@ -648,7 +648,7 @@ class felamimail_hooks
 					break;
 				}
 				//error_log(__METHOD__.__LINE__.array2string($preferences->identities));
-				$activeIdentity =& $preferences->getIdentity($icServerID);
+				$activeIdentity =& $preferences->getIdentity($icServerID, true);
 				//error_log(__METHOD__.__LINE__.' ActiveIdentity for profileID'.$icServerID.'->'.array2string($activeIdentity));
 				if ($imapServer->_connected != 1) $connectionStatus = $bofelamimail->openConnection($icServerID);
 				$folderObjects = $bofelamimail->getFolderObjects(true, false);
diff --git a/felamimail/inc/class.uifelamimail.inc.php b/felamimail/inc/class.uifelamimail.inc.php
index ed16446637..fdaf5702f0 100644
--- a/felamimail/inc/class.uifelamimail.inc.php
+++ b/felamimail/inc/class.uifelamimail.inc.php
@@ -646,7 +646,7 @@ class uifelamimail
 			//_debug_array($preferences->preferences);
 			//error_log(__METHOD__.__LINE__.' ImapServerId:'.$imapServer->ImapServerId.' Prefs:'.array2string($preferences->preferences));
 			//error_log(__METHOD__.__LINE__.' ImapServerObject:'.array2string($imapServer));
-			if (is_object($preferences)) $activeIdentity =& $preferences->getIdentity(self::$icServerID);
+			if (is_object($preferences)) $activeIdentity =& $preferences->getIdentity(self::$icServerID, true);
 			//_debug_array($activeIdentity);
 			$maxMessages	=  50;
 			if (isset($GLOBALS['egw_info']['user']['preferences']['felamimail']['prefMailGridBehavior']) && (int)$GLOBALS['egw_info']['user']['preferences']['felamimail']['prefMailGridBehavior'] <> 0)