diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js
index 105a045ff5..ebcaac8a9b 100644
--- a/api/js/jsapi/app_base.js
+++ b/api/js/jsapi/app_base.js
@@ -14,9 +14,9 @@ import {etemplate2} from "../etemplate/etemplate2";
 import {et2_createWidget} from "../etemplate/et2_core_widget";
 import {Et2Dialog} from "../etemplate/Et2Dialog/Et2Dialog";
 import {et2_nextmatch} from "../etemplate/et2_extension_nextmatch";
-import {EGW_KEY_ENTER} from "../egw_action/egw_action_constants";
 import "sortablejs/Sortable.min.js";
 import {Et2Favorites} from "../etemplate/Et2Favorites/Et2Favorites";
+import {egw_globalObjectManager} from "../egw_action/egw_action";
 
 /**
  * Common base class for application javascript
diff --git a/mail/js/app.js b/mail/js/app.js
index 58784597a3..8842cd653b 100755
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1678,13 +1678,13 @@ app.classes.mail = AppJS.extend(
 		if (!this.et2 && !this.checkET2()) return;
 		if (_data == null)
 		{
-			this.et2.getWidgetById('mail.index.vacationnotice').set_disabled(true);
+			this.et2.getWidgetById('mail.index.vacationnotice')?.set_disabled(true);
 			this.et2.getWidgetById(this.nm_index+'[vacationnotice]').set_value('');
 			this.et2.getWidgetById(this.nm_index+'[vacationrange]').set_value('');
 		}
 		else
 		{
-			this.et2.getWidgetById('mail.index.vacationnotice').set_disabled(false);
+			this.et2.getWidgetById('mail.index.vacationnotice')?.set_disabled(false);
 			this.et2.getWidgetById(this.nm_index+'[vacationnotice]').set_value(_data.vacationnotice);
 			this.et2.getWidgetById(this.nm_index+'[vacationrange]').set_value(_data.vacationrange);
 		}