diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php
index fe679ae04d..873461b337 100644
--- a/mail/inc/class.mail_hooks.inc.php
+++ b/mail/inc/class.mail_hooks.inc.php
@@ -77,26 +77,23 @@ class mail_hooks
 				'menuaction' => 'mail.mail_ui.displayMessage',
 			),
 			'view_id'    => 'id',
-			'view_popup' => '870xegw_getWindowOuterHeight()',
-			//'view_popup' => '870x800',
+			'view_popup' => '870xavailHeight',
 			'view_list'	=>	'mail.mail_ui.index',
 			'add'        => array(
 				'menuaction' => 'mail.mail_compose.compose',
 			),
-			//'add_popup'  => '870xegw_getWindowOuterHeight()',
-			'add_popup'  => '870x800',
+			'add_popup'  => '870xavailHeight',
 			'edit'        => array(
 				'menuaction' => 'mail.mail_compose.compose',
 			),
 			'edit_id'    => 'id',
-			//'edit_popup'  => '870xegw_getWindowOuterHeight()',
-			'edit_popup'  => '870x800',
+			'edit_popup'  => '870xavailHeight',
 			// register mail as handler for .eml files
 			'mime' => array(
 				'message/rfc822' => array(
 					'menuaction' => 'mail.mail_ui.importMessageFromVFS2DraftAndDisplay',
 					'mime_url'   => 'formData[file]',
-					'mime_popup' => '870xegw_getWindowOuterHeight()',
+					'mime_popup' => '870xavailHeight',
 				),
 			),
 			'entry' => 'Mail',
diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index d0576aa572..6cc1dc02cf 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -235,6 +235,10 @@
 							// to take padding/margin into account
 							var delta_width = w.width - ($et2.outerWidth(true) + ($main_div.outerWidth(true) - $main_div.width()));
 							var delta_height = w.height - ($et2.outerHeight(true) + ($main_div.outerHeight(true) - $main_div.height()));
+							if (delta_height && egw_getWindowOuterHeight() >= egw.availHeight())
+							{
+								delta_height = 0;
+							}
 							if(delta_width != 0 || delta_height != 0)
 							{
 								window.resizeTo(egw_getWindowOuterWidth() - delta_width,egw_getWindowOuterHeight() - delta_height);
diff --git a/phpgwapi/js/jsapi/egw_open.js b/phpgwapi/js/jsapi/egw_open.js
index 9ddc90b824..22202c2e9f 100644
--- a/phpgwapi/js/jsapi/egw_open.js
+++ b/phpgwapi/js/jsapi/egw_open.js
@@ -279,7 +279,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
 			if (_popup)
 			{
 				var w_h = _popup.split('x');
-				if (w_h[1] == 'egw_getWindowOuterHeight()') w_h[1] = egw_getWindowOuterHeight();
+				if (w_h[1] == 'availHeight') w_h[1] = this.availHeight();
 				var popup_window = _wnd.egw_openWindowCentered2(url, _target || '_blank', w_h[0], w_h[1], false, _target_app, true);
 
 				// Remember which windows are open
@@ -303,6 +303,14 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
 			}
 		},
 
+		/**
+		 * Get available height of screen
+		 */
+		availHeight: function()
+		{
+			return screen.availHeight < screen.height ? screen.availHeight : screen.height - 100;
+		},
+
 		/**
 		 * Use frameworks (framed template) link handler to open a url
 		 *