diff --git a/admin/js/app.js b/admin/js/app.js
index 833aedd286..4ddffb5bd6 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -43,19 +43,19 @@ var AdminApp = /** @class */ (function (_super) {
      * @memberOf app.classes.admin
      */
     function AdminApp() {
-        var _this =
+		var _this =
 			// call parent
 			_super.call(this, 'admin') || this;
-        /**
-         * reference to iframe
-         *
-         * {et2_iframe}
-         */
-        _this.iframe = null;
-        /**
-         * reference to nextmatch
-         *
-         * {et2_extension_nextmatch}
+		/**
+		 * reference to iframe
+		 *
+		 * {et2_iframe}
+		 */
+		_this.iframe = null;
+		/**
+		 * reference to nextmatch
+		 *
+		 * {et2_extension_nextmatch}
          */
         _this.nm = null;
         /**
@@ -771,7 +771,7 @@ var AdminApp = /** @class */ (function (_super) {
                 params.account_id = _senders[0].id.split('::').pop(); // get last :: separated part
                 break;
         }
-        this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup);
+		this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup, 'admin');
     };
     /**
      * Submit statistic
diff --git a/admin/js/app.ts b/admin/js/app.ts
index 169d3fb1d9..207a81747d 100644
--- a/admin/js/app.ts
+++ b/admin/js/app.ts
@@ -895,13 +895,13 @@ class AdminApp extends EgwApp
 			case 'copy':
 				params.owner = '0';
 				params.copy = true;
-				// Fall through
+			// Fall through
 			default:
 				params.account_id = _senders[0].id.split('::').pop();	// get last :: separated part
 				break;
 		}
 
-		this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup);
+		this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup, 'admin');
 	}
 
 	/**
diff --git a/mail/js/app.js b/mail/js/app.js
index 1222fc5ad9..c50d0ac6a0 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -2616,7 +2616,7 @@ app.classes.mail = AppJS.extend(
 	 */
 	mail_displayHeaderLines: function(_url) {
 		// only used by right clickaction
-		egw_openWindowCentered(_url,'mail_display_headerLines','870','600',window.outerWidth/2,window.outerHeight/2);
+		egw.openPopup(_url, '870', '600', null, 'mail');
 	},
 
 	/**