diff --git a/felamimail/inc/class.felamimail_bo.inc.php b/felamimail/inc/class.felamimail_bo.inc.php
index daaa7ff99c..17f39bfd38 100644
--- a/felamimail/inc/class.felamimail_bo.inc.php
+++ b/felamimail/inc/class.felamimail_bo.inc.php
@@ -175,10 +175,17 @@ class felamimail_bo
 	{
 		if ($_profileID == 0)
 		{
-			$profileID = emailadmin_bo::getUserDefaultProfileID();
+			if (isset($GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID']))
+			{
+				$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID'];
+			}
+			else
+			{
+				$profileID = emailadmin_bo::getUserDefaultProfileID();
+			}
 			if ($profileID!=$_profileID) $_restoreSession==false;
 			$_profileID=$profileID;
-			if (self::$debug) error_log(__METHOD__.__LINE__.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
+			if (self::$debug); error_log(__METHOD__.__LINE__.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
 		}
 		if ($_profileID != 0 && $_validate)
 		{
diff --git a/felamimail/inc/class.uicompose.inc.php b/felamimail/inc/class.uicompose.inc.php
index c35d5403e5..c529e43a8f 100644
--- a/felamimail/inc/class.uicompose.inc.php
+++ b/felamimail/inc/class.uicompose.inc.php
@@ -345,6 +345,7 @@
 				$sessionData['to'] = base64_decode($_REQUEST['send_to']);
 				// first check if there is a questionmark or ampersand
 				if (strpos($sessionData['to'],'?')!== false) list($sessionData['to'],$rest) = explode('?',$sessionData['to'],2);
+				$sessionData['to'] = html_entity_decode($sessionData['to']);
 				if (($at_pos = strpos($sessionData['to'],'@')) !== false)
 				{
 					if (($amp_pos = strpos(substr($sessionData['to'],$at_pos),'&')) !== false)