diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 551c064..ec3c05e 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -70,7 +70,6 @@ typedef struct {
 	GtkWidget *description;
 	GtkWidget *location;
 	GtkWidget *treeview;
-	GtkWidget *scrolledwindow;
 
 	AlarmFuncInfo *cur_funcinfo;
 
@@ -265,13 +264,12 @@ notified_alarms_dialog_new (void)
 	an->description = e_builder_get_widget (an->builder, "description-label");
 	an->location = e_builder_get_widget (an->builder, "location-label");
 	an->treeview = e_builder_get_widget (an->builder, "appointments-treeview");
-	an->scrolledwindow = e_builder_get_widget (an->builder, "treeview-scrolledwindow");
 	snooze_btn = e_builder_get_widget (an->builder, "snooze-button");
 	an->snooze_btn = snooze_btn;
 	an->dismiss_btn = e_builder_get_widget (an->builder, "dismiss-button");
 	edit_btn = e_builder_get_widget (an->builder, "edit-button");
 
-	if (!(an->dialog && an->scrolledwindow && an->treeview && an->snooze_time_min && an->snooze_time_hrs
+	if (!(an->dialog && an->treeview && an->snooze_time_min && an->snooze_time_hrs
 	      && an->description && an->location && edit_btn && snooze_btn && an->dismiss_btn)) {
 		g_warning ("alarm_notify_dialog(): Could not find all widgets in alarm-notify.ui file!");
 		g_object_unref (an->builder);
@@ -441,8 +439,10 @@ fill_in_labels (AlarmNotify *an, const gchar *summary, const gchar *description,
 	GtkTextTagTable *table = gtk_text_tag_table_new ();
 	GtkTextBuffer *buffer =  gtk_text_buffer_new (table);
 	gtk_text_buffer_set_text (buffer, description, -1);
+	e_buffer_tagger_disconnect (GTK_TEXT_VIEW (an->description));
 	gtk_text_view_set_buffer (GTK_TEXT_VIEW (an->description), buffer);
 	gtk_label_set_text (GTK_LABEL (an->location), location);
+	e_buffer_tagger_connect (GTK_TEXT_VIEW (an->description));
 	e_buffer_tagger_update_tags (GTK_TEXT_VIEW (an->description));
 	g_object_unref (table);
 	g_object_unref (buffer);
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index df6a8fc..7722a7e 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -374,12 +374,13 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 		const gchar *name = e_source_get_property (source, "auth-domain");
 
 		if (!name)
-			name = e_source_peek_name (source);
+			name = "Calendar";
 
 		if (!e_passwords_get_password (name, pass_key)) {
 			g_mutex_unlock (an->priv->mutex);
 			g_free (str_uri);
 			g_free (pass_key);
+
 			return;
 		}
 	}
@@ -394,6 +395,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 		e_cal_set_default_timezone (client, config_data_get_timezone (), NULL);
 		e_cal_open_async (client, FALSE);
 	}
+
 	g_free (str_uri);
 	g_free (pass_key);
 	g_mutex_unlock (an->priv->mutex);
diff --git a/calendar/gui/alarm-notify/alarm-notify.ui b/calendar/gui/alarm-notify/alarm-notify.ui
index 0051c7e..b83d9f3 100644
--- a/calendar/gui/alarm-notify/alarm-notify.ui
+++ b/calendar/gui/alarm-notify/alarm-notify.ui
@@ -2,6 +2,17 @@
 <interface>
   <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">12</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">5</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">5</property>
+    <property name="upper">59</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="alarm-notify">
     <property name="visible">True</property>
     <property name="border_width">5</property>
@@ -252,8 +263,10 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
