diff --git a/mozilla/calendar/base/content/calendar-recurrence-dialog.js b/mozilla/calendar/base/content/calendar-recurrence-dialog.js
index 77357cd4a08..4adf196dea6 100644
--- a/mozilla/calendar/base/content/calendar-recurrence-dialog.js
+++ b/mozilla/calendar/base/content/calendar-recurrence-dialog.js
@@ -71,6 +71,9 @@ function onCancel()
 
 function loadDialog()
 {
+    if (!window.originalRecurrenceInfo)
+        return;
+
     var ritems = window.originalRecurrenceInfo.getRecurrenceItems({});
 
     /* split out rules and exceptions */
@@ -92,17 +95,25 @@ function loadDialog()
 
         switch(rule.type) {
         case "DAILY":
-            setElementValue("period-deck", 0, "selectedIndex");
+            document.getElementById("period-list").selectedIndex = 0;
+
             setElementValue("daily-days", rule.interval);
             break;
         case "WEEKLY":
-            setElementValue("period-deck", 1, "selectedIndex");
+            document.getElementById("period-list").selectedIndex = 1;
+
+            const byDayTable = { 1 : "sun", 2 : "mon", 3 : "tue", 4 : "wed",
+                                 5 : "thu", 6 : "fri", 7: "sat" };
+
+            for each (var i in rule.getComponent("BYDAY", {})) {
+                setElementValue("weekly-" + byDayTable[i], "true", "checked");
+            }
             break;
         case "MONTHLY":
-            setElementValue("period-deck", 2, "selectedIndex");
+            document.getElementById("period-list").selectedIndex = 2;
             break;
         case "YEARLY":
-            setElementValue("period-deck", 3, "selectedIndex");
+            document.getElementById("period-list").selectedIndex = 3;
             break;
         default:
             dump("unable to handle your rule type!\n");
@@ -144,12 +155,27 @@ function saveDialog()
         break;
     case 1:
         recRule.type = "WEEKLY";
+        recRule.interval = 1; // XXX we need to support every 2 weeks and so on..
+        var onDays = [];
+        ["sun", "mon", "tue", "wed", "thu", "fri", "sat"].
+            forEach(function(d)
+                    {
+                        var elem = document.getElementById("weekly-" + d); 
+                        if (elem.checked) {
+                            onDays.push(elem.getAttribute("value"));
+                        }
+                    });
+        recRule.setComponent("BYDAY", onDays.length, onDays);
         break;
     case 2:
         recRule.type = "MONTHLY";
         break;
     case 3:
         recRule.type = "YEARLY";
+        var nyears = Number(getElementValue("yearly-years"));
+        if (nyears == null)
+            nyears = 1;
+        recRule.interval = nyears;
         break;
     }
 
diff --git a/mozilla/calendar/base/content/calendar-recurrence-dialog.xul b/mozilla/calendar/base/content/calendar-recurrence-dialog.xul
index 5179b4b32d8..4bd2725a87c 100644
--- a/mozilla/calendar/base/content/calendar-recurrence-dialog.xul
+++ b/mozilla/calendar/base/content/calendar-recurrence-dialog.xul
@@ -103,15 +103,15 @@
               </menulist>
               <hbox>
                 <vbox>
-                  <checkbox label="Monday"/>
-                  <checkbox label="Tuesday"/>
-                  <checkbox label="Wednesday"/>
-                  <checkbox label="Thursday"/>
+                  <checkbox id="weekly-mon" label="Monday" value="2"/>
+                  <checkbox id="weekly-tue" label="Tuesday" value="3"/>
+                  <checkbox id="weekly-wed" label="Wednesday" value="4"/>
+                  <checkbox id="weekly-thu" label="Thursday" value="5"/>
                 </vbox>
                 <vbox>
-                  <checkbox label="Friday"/>
-                  <checkbox label="Saturday"/>
-                  <checkbox label="Sunday"/>
+                  <checkbox id="weekly-fri" label="Friday" value="6"/>
+                  <checkbox id="weekly-sat" label="Saturday" value="7"/>
+                  <checkbox id="weekly-sun" label="Sunday" value="1"/>
                 </vbox>
               </hbox>
             </vbox>
@@ -122,7 +122,7 @@
             </hbox>
 
             <hbox align="top">
-              <textbox width="30"/>
+              <textbox id="yearly-years" width="30"/>
               <label value="years"/>
             </hbox>