diff --git a/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml b/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml
index dbfb78b63b31..82da6b2feabb 100644
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml
+++ b/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml
@@ -813,6 +813,15 @@
         </body>
       </method>
 
+      <property name="firstVisibleRow">
+        <getter>
+          <![CDATA[
+            var listbox = document.getAnonymousElementByAttribute(this, "anonid", "listbox");
+            return listbox.getIndexOfFirstVisibleRow();
+          ]]>
+        </getter>
+      </property>
+
       <method name="createAttendee">
         <body>
           <![CDATA[
@@ -2916,6 +2925,14 @@
     </implementation>
 
     <handlers>
+
+      <handler event="DOMMouseScroll" phase="capturing">
+        <![CDATA[
+          // ignore mouse scrolling for now...
+          event.stopPropagation();
+        ]]>
+      </handler>
+
       <handler event="DOMAttrModified">
         <![CDATA[
           if(event.attrName == "width") {
@@ -2923,26 +2940,45 @@
             selectionbar.setWidth(selectionbar.boxObject.width);
             return;
           }
-        
-          if(event.attrName != "curpos")
-            return;
+
+          // synchronize grid and attendee list
+          var target = event.originalTarget;
+          if(target.hasAttribute("anonid")) {
+            if(target.getAttribute("anonid") == "input") {
+              if(event.attrName == "focused") {
+                if(event.newValue == "true") {
+                  var attendees = document.getAnonymousElementByAttribute(this, "anonid", "attendees-list");
+                  var grid = document.getAnonymousElementByAttribute(this, "anonid", "freebusy-grid");
+                  if(grid.firstVisibleRow != attendees.firstVisibleRow)
+                    grid.firstVisibleRow = attendees.firstVisibleRow;
+                }
+              }
+            }
+          }
+
           var scrollbar = event.originalTarget.parentNode;
           if (!scrollbar.hasAttribute("maxpos"))
             return;
           if(scrollbar.getAttribute("anonid") == "vertical-scrollbar") {
-            var maxpos = scrollbar.getAttribute("maxpos");
             var attendees = document.getAnonymousElementByAttribute(this, "anonid", "attendees-list");
-            attendees.ratio = event.newValue/maxpos;
+            var grid = document.getAnonymousElementByAttribute(this, "anonid", "freebusy-grid");
+            if(event.attrName == "curpos") {
+              var maxpos = scrollbar.getAttribute("maxpos");
+              attendees.ratio = event.newValue/maxpos;
+            }
+            grid.firstVisibleRow = attendees.firstVisibleRow;
           }
           else if(scrollbar.getAttribute("anonid") == "horizontal-scrollbar") {
-            var maxpos = scrollbar.getAttribute("maxpos");
-            var ratio = event.newValue/maxpos;
-            var timebar = document.getAnonymousElementByAttribute(this, "anonid", "timebar");
-            var grid = document.getAnonymousElementByAttribute(this, "anonid", "freebusy-grid");
-            var selectionbar = document.getAnonymousElementByAttribute(this, "anonid", "selection-bar");
-            timebar.scroll = ratio;
-            grid.scroll = ratio;
-            selectionbar.ratio = ratio;
+            if(event.attrName == "curpos") {
+              var maxpos = scrollbar.getAttribute("maxpos");
+              var ratio = event.newValue/maxpos;
+              var timebar = document.getAnonymousElementByAttribute(this, "anonid", "timebar");
+              var grid = document.getAnonymousElementByAttribute(this, "anonid", "freebusy-grid");
+              var selectionbar = document.getAnonymousElementByAttribute(this, "anonid", "selection-bar");
+              timebar.scroll = ratio;
+              grid.scroll = ratio;
+              selectionbar.ratio = ratio;
+            }
           }
       ]]>
       </handler>
diff --git a/calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml b/calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml
index 37757fa0568a..d1a20e58eaf1 100644
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml
+++ b/calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml
@@ -767,6 +767,8 @@
           <![CDATA[
           // how much pixels spans a single day
           var oneday = this.contentWidth;
+          if(oneday <= 0)
+            return val;
                     
           // the difference in pixels between the content and the container.
           var shift = (oneday*this.mRange)-(this.containerWidth);
@@ -1202,6 +1204,33 @@
         </setter>
       </property>
 
+      <property name="firstVisibleRow">
+        <getter>
+          <![CDATA[
+            var listbox = document.getAnonymousElementByAttribute(this, "anonid", "listbox");
+            return listbox.getIndexOfFirstVisibleRow();
+          ]]>
+        </getter>
+        <setter>
+          <![CDATA[
+          var listbox = document.getAnonymousElementByAttribute(this, "anonid", "listbox");
+          listbox.scrollToIndex(val);
+          return val;
+          ]]>
+        </setter>
+      </property>
+
+      <property name="ratio">
+        <setter>
+          <![CDATA[
+          var listbox = document.getAnonymousElementByAttribute(this, "anonid", "listbox");
+          var rowcount = listbox.getRowCount();
+          listbox.scrollToIndex(Math.floor(rowcount*val));
+          return val;
+          ]]>
+        </setter>
+      </property>
+
       <field name="mFreeBusyListener">
         <![CDATA[
         ({
