diff --git a/calendar/resources/content/eventDialog.js b/calendar/resources/content/eventDialog.js
index e2e8d580fc1e..7eae4dc13c66 100644
--- a/calendar/resources/content/eventDialog.js
+++ b/calendar/resources/content/eventDialog.js
@@ -916,18 +916,29 @@ function updateMenuPlural( lengthFieldId, menuId )
 
 function updateUntilItemEnabled()
 {
-   var repeatUntilRadio = document.getElementById( "repeat-until-radio" );
    var repeatCheckBox = document.getElementById( "repeat-checkbox" );
+   var numberRadio = document.getElementById("repeat-numberoftimes-radio");
+   var numberTextBox = document.getElementById("repeat-numberoftimes-textbox");
    
-   var repeatEndText = document.getElementById( "repeat-end-date-picker" );
-   
-   if( repeatCheckBox.checked && repeatUntilRadio.selected  )
+   if( repeatCheckBox.checked && numberRadio.selected  )
    {
-      repeatEndText.removeAttribute( "disabled"  );
+      numberTextBox.removeAttribute( "disabled"  );
    }
    else
    {
-      repeatEndText.setAttribute( "disabled", "true" );
+      numberTextBox.setAttribute( "disabled", "true" );
+   }
+
+   var untilRadio = document.getElementById( "repeat-until-radio" );
+   var untilPicker = document.getElementById( "repeat-end-date-picker" );
+   
+   if( repeatCheckBox.checked && untilRadio.selected  )
+   {
+      untilPicker.removeAttribute( "disabled"  );
+   }
+   else
+   {
+      untilPicker.setAttribute( "disabled", "true" );
    }
 }
 
diff --git a/calendar/resources/content/eventDialog.xul b/calendar/resources/content/eventDialog.xul
index aef2803ee4a6..ae4ed7d3127a 100644
--- a/calendar/resources/content/eventDialog.xul
+++ b/calendar/resources/content/eventDialog.xul
@@ -462,31 +462,29 @@
                                disable-controller="repeat"
                                label="&newevent.forever.label;"
                                oncommand="commandUntil()"/>
-                           <hbox>
-                              <radio id="repeat-numberoftimes-radio"
-                                     disable-controller="repeat"
-                                     label="&newevent.numberoftimes.label;"
-                                     oncommand=""/>
-                              <textbox id="repeat-numberoftimes-textbox"
-                                       disable-controller="repeat"/>
-                           </hbox>
-                        <vbox id="repeat-end-box" align="center">
-                            <hbox>
-                                <radio id="repeat-until-radio"
-                                       disable-controller="repeat"
-                                       label="&newevent.until.label;"
-                                       oncommand="commandUntil()"/>
-                                 <spacer id="until-spacer"/>
-                                 <datepicker id="repeat-end-date-picker"
-                                             disable-controller="repeat"
-                                             value=""
-                                             onchange="commandUntil()"/>
-                              </hbox>
-                              <label id="repeat-time-warning"
-                                     class="warning-text-class"
-                                     value="&newevent.recurend.warning;"
-                                     collapsed="true"/>
-                        </vbox>
+                        <hbox>
+                           <radio id="repeat-numberoftimes-radio"
+                                  disable-controller="repeat"
+                                  label="&newevent.numberoftimes.label;"
+                                  oncommand="commandUntil()"/>
+                           <textbox id="repeat-numberoftimes-textbox"
+                                    disable-controller="repeat"/>
+                        </hbox>
+                        <hbox>
+                           <radio id="repeat-until-radio"
+                                  disable-controller="repeat"
+                                  label="&newevent.until.label;"
+                                  oncommand="commandUntil()"/>
+                            <spacer id="until-spacer"/>
+                            <datepicker id="repeat-end-date-picker"
+                                        disable-controller="repeat"
+                                        value=""
+                                        onchange="commandUntil()"/>
+                        </hbox>
+                        <label id="repeat-time-warning"
+                               class="warning-text-class"
+                               value="&newevent.recurend.warning;"
+                               collapsed="true"/>
                      </radiogroup>
                   </hbox>
                     
diff --git a/calendar/resources/content/toDoDialog.js b/calendar/resources/content/toDoDialog.js
index d724cc71063f..714894067a49 100644
--- a/calendar/resources/content/toDoDialog.js
+++ b/calendar/resources/content/toDoDialog.js
@@ -953,18 +953,29 @@ function updateMenuPlural( lengthFieldId, menuId )
 
 function updateUntilItemEnabled()
 {
-   var repeatUntilRadio = document.getElementById( "repeat-until-radio" );
    var repeatCheckBox = document.getElementById( "repeat-checkbox" );
+   var numberRadio = document.getElementById("repeat-numberoftimes-radio");
+   var numberTextBox = document.getElementById("repeat-numberoftimes-textbox");
    
-   var repeatEndText = document.getElementById( "repeat-end-date-picker" );
-   
-   if( repeatCheckBox.checked && repeatUntilRadio.selected  )
+   if( repeatCheckBox.checked && numberRadio.selected  )
    {
-      repeatEndText.removeAttribute( "disabled"  );
+      numberTextBox.removeAttribute( "disabled"  );
    }
    else
    {
-      repeatEndText.setAttribute( "disabled", "true" );
+      numberTextBox.setAttribute( "disabled", "true" );
+   }
+
+   var untilRadio = document.getElementById( "repeat-until-radio" );
+   var untilPicker = document.getElementById( "repeat-end-date-picker" );
+   
+   if( repeatCheckBox.checked && untilRadio.selected  )
+   {
+      untilPicker.removeAttribute( "disabled"  );
+   }
+   else
+   {
+      untilPicker.setAttribute( "disabled", "true" );
    }
 }
 
diff --git a/calendar/resources/content/toDoDialog.xul b/calendar/resources/content/toDoDialog.xul
index 25529b04e579..c13a6fc84fa0 100644
--- a/calendar/resources/content/toDoDialog.xul
+++ b/calendar/resources/content/toDoDialog.xul
@@ -521,31 +521,29 @@
                                disable-controller="repeat"
                                label="&newevent.forever.label;"
                                oncommand="commandUntil()"/>
-                           <hbox>
-                              <radio id="repeat-numberoftimes-radio"
-                                     disable-controller="repeat"
-                                     label="&newevent.numberoftimes.label;"
-                                     oncommand=""/>
-                              <textbox id="repeat-numberoftimes-textbox"
-                                       disable-controller="repeat"/>
-                           </hbox>
-                        <vbox id="repeat-end-box" align="center">
-                            <hbox>
-                                <radio id="repeat-until-radio"
-                                       disable-controller="repeat"
-                                       label="&newevent.until.label;"
-                                       oncommand="commandUntil()"/>
-                                 <spacer id="until-spacer"/>
-                                 <datepicker id="repeat-end-date-picker"
-                                             disable-controller="repeat"
-                                             value=""
-                                             onchange="commandUntil()"/>
-                              </hbox>
-                              <label id="repeat-time-warning"
-                                     class="warning-text-class"
-                                     value="&newevent.recurend.warning;"
-                                     collapsed="true"/>
-                        </vbox>
+                        <hbox>
+                           <radio id="repeat-numberoftimes-radio"
+                                  disable-controller="repeat"
+                                  label="&newevent.numberoftimes.label;"
+                                  oncommand="commandUntil()"/>
+                           <textbox id="repeat-numberoftimes-textbox"
+                                    disable-controller="repeat"/>
+                        </hbox>
+                        <hbox>
+                            <radio id="repeat-until-radio"
+                                   disable-controller="repeat"
+                                   label="&newevent.until.label;"
+                                   oncommand="commandUntil()"/>
+                             <spacer id="until-spacer"/>
+                             <datepicker id="repeat-end-date-picker"
+                                         disable-controller="repeat"
+                                         value=""
+                                         onchange="commandUntil()"/>
+                        </hbox>
+                        <label id="repeat-time-warning"
+                               class="warning-text-class"
+                               value="&newevent.recurend.warning;"
+                               collapsed="true"/>
                      </radiogroup>
                   </hbox>