diff --git a/mail/js/app.js b/mail/js/app.js
index 72735860ed..f6c4460042 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -4078,11 +4078,11 @@ app.classes.mail = AppJS.extend(
 					break;
 				case 'add'	:
 					linkData = "mail.mail_sieve.edit";
-					this.egw.open_link(linkData,'_blank',"600x480");
+					this.egw.open_link(linkData,'_blank',"600x680");
 					break;
 				case 'edit'	:
 					linkData = "mail.mail_sieve.edit&ruleID="+ruleID;
-					this.egw.open_link(linkData,'_blank',"600x480");
+					this.egw.open_link(linkData,'_blank',"600x680");
 					break;
 				case 'enable':
 					actionData = _type.parent.data.widget.getArrayMgr('content');
diff --git a/mail/templates/default/sieve.edit.xet b/mail/templates/default/sieve.edit.xet
index 5af9cda317..aa9a2e74b8 100644
--- a/mail/templates/default/sieve.edit.xet
+++ b/mail/templates/default/sieve.edit.xet
@@ -52,7 +52,7 @@
 							<menupopup id="bodytransform"/>
 						</menulist>
 						<description value="Contains(*)"/>
-						<textbox id="field_bodytransform"  width="62%"/>
+						<textbox id="field_bodytransform"/>
 					</hbox>
 				</row>
 				<row>
@@ -62,7 +62,7 @@
 							<menupopup id="ctype"/>
 						</menulist>
 						<description value="/"/>
-						<textbox blur="for eg.: mpeg" id="field_ctype_val" width="71%"/>
+						<textbox blur="for eg.: mpeg" id="field_ctype_val"/>
 					</hbox>
 				</row>
 				<row>
@@ -115,7 +115,7 @@
 		</grid>
 	</template>
 	<template id="mail.sieve.edit" template="" lang="" group="0" version="1.9.001">
-		<grid width="100%">
+		<grid width="100%" height="100%">
 			<columns>
 				<column/>
 			</columns>
@@ -128,7 +128,7 @@
 					</hbox>
 				</row>
 				<row>
-					<tabbox id="tabs" class="et2_nowrap" width="100%" span="all" tab_height="300">
+					<tabbox id="tabs" class="et2_nowrap" width="100%" span="all" tab_height="440">
 						<tabs>
 							<tab id="condition" label="Condition"/>
 							<tab id="action" label="Action"/>
diff --git a/mail/templates/default/sieve.index.xet b/mail/templates/default/sieve.index.xet
index 2c21b30a4e..c601f45e04 100644
--- a/mail/templates/default/sieve.index.xet
+++ b/mail/templates/default/sieve.index.xet
@@ -31,7 +31,7 @@
 			</columns>
 			<rows>
 				<row class="nextmatch_header_row">
-					<buttononly class="$cont[hideIfSieveDisabled] et2_toolbar" align="left" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_sieve.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
+					<buttononly class="$cont[hideIfSieveDisabled] et2_toolbar" align="left" id="add" onclick="window.open(egw::link('/index.php','menuaction=mail.mail_sieve.edit'),'_blank','dependent=yes,width=600,height=680,scrollbars=yes,status=yes'); return false;"/>
 				</row>
 				<row>
 					<template id="rows"/>