diff --git a/src/evolution-webcal-notify.c b/src/evolution-webcal-notify.c
index 77251d4..4242335 100644
--- a/src/evolution-webcal-notify.c
+++ b/src/evolution-webcal-notify.c
@@ -89,14 +89,10 @@ static void e_webcal_icon_theme_changed (GtkIconTheme * theme,
 				"x-office-calendar", GTK_ICON_SIZE_DIALOG);
 }
 
-static void e_webcal_change_adjustment (GtkMenuShell * shell,
-					GtkWidget * spinner) {
-  GtkWidget * widget;
-
-  widget = gtk_menu_get_active (GTK_MENU (shell));
-
-  if (widget != NULL) {
-    switch (g_list_index (shell->children, widget)) {
+static void e_webcal_change_adjustment (GtkComboBox * toption,
+                    GtkWidget * spinner) {
+  if (toption != NULL) {
+	switch (gtk_combo_box_get_active (toption)) {
     case E_ICALSHARE_TIMEOUT_DAYS:
       gtk_spin_button_set_range (GTK_SPIN_BUTTON (spinner), 1, 6);
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinner), 1);
@@ -117,20 +113,6 @@ static void e_webcal_change_adjustment (GtkMenuShell * shell,
   }
 }
 
-static gint e_webcal_option_menu_get (GtkOptionMenu * menu) {
-  GtkWidget * widget;
-
-  g_return_val_if_fail (GTK_IS_OPTION_MENU (menu), -1);
-
-  widget = gtk_menu_get_active (GTK_MENU (menu->menu));
-
-  if (widget != NULL) {
-    return g_list_index (GTK_MENU_SHELL (menu->menu)->children, widget);
-  }
-
-  return -1;
-}
-
 void e_webcal_display_error (const gchar * title, const gchar * message,
 			     GtkWidget * parent) {
   GtkWidget * dialog;
@@ -235,7 +217,6 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
   EIcalShareDialog * dialog;
   GtkObject * spinadj;
   GtkWidget * tspinb, * toption;
-  GtkWidget * menu, * mitem;
   GtkWidget * vbox, * hbox;
   GtkWidget * lbox, * wbox, * xbox;
   GtkWidget * rlabel, * clabel;
@@ -474,36 +455,21 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
 
   gtk_label_set_mnemonic_widget (GTK_LABEL (rlabel), tspinb);
 
-  toption = gtk_option_menu_new ();
+  toption = gtk_combo_box_new_text();
   gtk_box_pack_start (GTK_BOX (hbox), toption, FALSE, FALSE, 0);
   gtk_widget_show (toption);
 
-  menu = gtk_menu_new ();
-
-  mitem = gtk_menu_item_new_with_label (_("Days"));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), mitem);
-  gtk_widget_show (mitem);
-
-  mitem = gtk_menu_item_new_with_label (_("Hours"));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), mitem);
-  gtk_widget_show (mitem);
-
-  mitem = gtk_menu_item_new_with_label (_("Minutes"));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), mitem);
-  gtk_widget_show (mitem);
-
-  mitem = gtk_menu_item_new_with_label (_("Weeks"));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), mitem);
-  gtk_widget_show (mitem);
+  gtk_combo_box_append_text (GTK_COMBO_BOX (toption), _("Days"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (toption), _("Hours"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (toption), _("Minutes"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (toption), _("Weeks"));
 
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (toption), menu);
-  gtk_option_menu_set_history (GTK_OPTION_MENU (toption),
-			       E_ICALSHARE_TIMEOUT_HOURS);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (toption), E_ICALSHARE_TIMEOUT_HOURS);
 
   /* If the user changes the units of time, we want to update the spin
      button with more appropriate ranges for the time to refresh */
-  g_signal_connect (G_OBJECT (menu), "deactivate",
-		    G_CALLBACK (e_webcal_change_adjustment), tspinb);
+  g_signal_connect (GTK_COMBO_BOX (toption), "changed",
+            G_CALLBACK (e_webcal_change_adjustment), tspinb);
 
   /* Color button for the calendar properties */
   hbox = gtk_hbox_new (FALSE, 6);
@@ -528,7 +494,8 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
   case GTK_RESPONSE_HELP:
     break;
   case GTK_RESPONSE_OK:
-    switch (e_webcal_option_menu_get (GTK_OPTION_MENU (toption))) {
+	switch (gtk_combo_box_get_active (GTK_COMBO_BOX (toption)))
+	{
     case E_ICALSHARE_TIMEOUT_DAYS:
       ref_multi = 1440;
       break;
