diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index f135410e36..7af7a15263 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';
 		$etpl = new etemplate_new('mail.compose');
 
 		if ($content['mimeType']=='html')
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 1d0293d753..7703755995 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1794,6 +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';
 		$etpl = new etemplate_new('mail.display');
 		// Set cell attributes directly
 /*