diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 3fca55103e..427763f372 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1436,6 +1436,10 @@ class mail_ui
 		{
 			unset($actions['tracker']);
 		}
+		if (!isset($GLOBALS['egw_info']['user']['apps']['calendar']))
+		{
+			unset($actions['calendar']);
+		}
 		return $actions;
 	}
 
@@ -1688,7 +1692,7 @@ class mail_ui
 	function get_toolbar_actions()
 	{
 		$actions = $this->get_actions();
-		$arrActions = array('composeasnew','reply','reply_all','forward','flagged','delete','print','infolog','tracker','save','view');
+		$arrActions = array('composeasnew','reply','reply_all','forward','flagged','delete','print','infolog','tracker','calendar','save','view');
 		foreach( $arrActions as &$act)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));