diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index 8f4d7df9db..0a27ef4508 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -5292,7 +5292,7 @@ class mail_bo
 					$mailObject->set('error_count',0);
 					$sendOK = $openComposeWindow = $openAsDraft = null;
 					//error_log(__METHOD__.__LINE__.' Id To Merge:'.$val);
-					if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&
+					if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/
 						count($SendAndMergeTocontacts) > 1 &&
 						is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
 					{
@@ -5375,7 +5375,7 @@ class mail_bo
 						$mailObject->MessageID = '';
 						$mailObject->ClearAllRecipients();
 						$mailObject->ClearCustomHeaders();
-						if ($GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&
+						if (/*$GLOBALS['egw_info']['flags']['currentapp'] == 'addressbook' &&*/
 							is_numeric($val) || $GLOBALS['egw']->accounts->name2id($val)) // do the merge
 						{
 							$contact = $bo_merge->contacts->read($val);
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 7af7a15263..6f7c24d92f 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1210,7 +1210,7 @@ class mail_compose
 		$sel_options['mimeType'] = self::$mimeTypes;
 		$sel_options['priority'] = self::$priorities;
 		if (!isset($content['priority']) || empty($content['priority'])) $content['priority']=3;
-		$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';
+		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new etemplate_new('mail.compose');
 
 		if ($content['mimeType']=='html')
@@ -1338,7 +1338,7 @@ class mail_compose
 				}
 
 				// Merge does not work correctly (missing to) if current app is not addressbook
-				$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
+				//$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
 				// Actually do the merge
 				if(count($merge_ids) <= 1)
@@ -2741,7 +2741,7 @@ class mail_compose
 		}
 
 		// Merge does not work correctly (missing to) if current app is not addressbook
-		$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
+		//$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
 		// Actually do the merge
 		$results = $this->mail_bo->importMessageToMergeAndSend(
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 7703755995..d4bcd5616e 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1794,7 +1794,7 @@ unset($query['actions']);
 		$mailBody = $this->get_load_email_data($uid, $partID, $mailbox, $htmlOptions,false);
 		//error_log(__METHOD__.__LINE__.$mailBody);
 		$this->mail_bo->closeConnection();
-		$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';
+		//$GLOBALS['egw_info']['flags']['currentapp'] = 'mail';//should not be needed
 		$etpl = new etemplate_new('mail.display');
 		// Set cell attributes directly
 /*