diff --git a/UI/WebServerResources/UIxAppointmentEditor.css b/UI/WebServerResources/UIxAppointmentEditor.css
index 0c30a9d69..e5551acf7 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.css
+++ b/UI/WebServerResources/UIxAppointmentEditor.css
@@ -54,19 +54,10 @@ SELECT
 { margin-left: 1px; }
 
 LABEL#commentArea
-{ height: 15em; }
+{ height: 17em; }
 
 LABEL#commentArea textarea
-{ padding-bottom: 0em;
-  top: 0px;
-  left: 8em;
-  width: 380px;
-  height: 15em;
-  vertical-align: bottom;
-  position: absolute;
-  padding: 0px;
-  margin: 0px;
-  margin-left: 1px; }
+{ height: 15.5em; }
 
 SPAN.checkBoxList#participantsCB
 { height: 7em; }
@@ -80,7 +71,7 @@ DIV#participants UL.contactList
 SPAN.checkBoxList SPAN.content LABEL
 { display: inline; }
 
-SPAN.content
+n0SPAN.content
 { position: absolute;
   line-height: 2em;
   top: -.25em;
diff --git a/UI/WebServerResources/UIxComponentEditor.css b/UI/WebServerResources/UIxComponentEditor.css
index 18402899c..d7706711d 100644
--- a/UI/WebServerResources/UIxComponentEditor.css
+++ b/UI/WebServerResources/UIxComponentEditor.css
@@ -9,3 +9,32 @@ SPAN.datePicker INPUT.textField
 
 SPAN.timeDateControl A.button
 { border: 0; }
+
+SPAN.content
+{ position: absolute;
+  line-height: 2em;
+  top: -.25em;
+  left: 8em;
+  right: 1em; }
+
+SPAN.content > INPUT.textField,
+LABEL#commentArea textarea
+{ width: 380px; }
+
+LABEL, SPAN.checkBoxList
+{ display: block;
+  position: relative;
+  line-height: 1.5em;
+  height: 1.5em;
+  margin-left: 0px;
+  margin-bottom: .5em;
+  width: 100%; }
+
+LABEL#commentArea textarea
+{ padding-bottom: 0em;
+  top: 0px;
+  left: 8em;
+  position: absolute;
+  padding: 0px;
+  margin: 0px;
+  margin-left: 1px; }
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 768ec3456..a92c785c3 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -43,6 +43,7 @@ function onPopupUrlWindow(event) {
     }
     urlInput.value = newUrl;
   }
+	onWindowResize(event);
 
   return false;
 }
@@ -134,10 +135,31 @@ function onComponentEditorLoad(event) {
   $("repeatList").observe("change", onPopupRecurrenceWindow);
 	$("reminderHref").observe("click", onPopupReminderWindow);
 	$("reminderList").observe("change", onPopupReminderWindow);
+
+	Event.observe(window, "resize", onWindowResize);
+
   onPopupRecurrenceWindow(null);
 	onPopupReminderWindow(null);
 }
 
+function onWindowResize(event) {
+	var document = $("documentLabel");
+	var comment = $("commentArea");
+	var area = comment.select("textarea").first();
+	var offset = 6;
+	var height;
+
+	height = window.height() - comment.cumulativeOffset().top - offset;
+
+	if (document.visible())
+		height -= $("changeUrlButton").getHeight();
+	
+	area.setStyle({ height: (height - offset*2) + "px" });
+	comment.setStyle({ height: (height - offset) + "px" });
+	
+	return true;
+}
+
 function onPopupRecurrenceWindow(event) {
   if (event)
     preventDefault(event);
diff --git a/UI/WebServerResources/UIxTaskEditor.css b/UI/WebServerResources/UIxTaskEditor.css
index afa7cb9a6..8ae836752 100644
--- a/UI/WebServerResources/UIxTaskEditor.css
+++ b/UI/WebServerResources/UIxTaskEditor.css
@@ -25,10 +25,7 @@ LABEL#commentArea
 { height: 15em; }
 
 LABEL#commentArea textarea
-{ padding: 0;
-  margin: 0;
-  width: 380px;
-  height: 15em; }
+{ height: 15em; }
 
 SPAN.checkBoxList#participantsCB
 { height: 7em; }