diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index 7e4961b..e9a8161 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -1578,6 +1578,30 @@ tray_list_add_new (TrayIconData *data)
 	message_push ((Message *) msg);
 }
 
+static void
+alarm_queue_get_alarm_summary (ECalComponent *comp,
+			       const ECalComponentAlarmInstance *instance,
+			       ECalComponentText *text)
+{
+	ECalComponentAlarm *alarm;
+
+	g_return_if_fail (comp != NULL);
+	g_return_if_fail (instance != NULL);
+	g_return_if_fail (instance->auid != NULL);
+	g_return_if_fail (text != NULL);
+
+	text->value = NULL;
+
+	alarm = e_cal_component_get_alarm (comp, instance->auid);
+	if (alarm) {
+		e_cal_component_alarm_get_description (alarm, text);
+		e_cal_component_alarm_free (alarm);
+	}
+
+	if (!text->value || !*text->value)
+		e_cal_component_get_summary (comp, text);
+}
+
 /* Performs notification of a display alarm */
 static void
 display_notification (time_t trigger,
@@ -1603,7 +1627,7 @@ display_notification (time_t trigger,
 		return;
 
 	/* get a sensible description for the event */
-	e_cal_component_get_summary (comp, &text);
+	alarm_queue_get_alarm_summary (comp, qa->instance, &text);
 	e_cal_component_get_organizer (comp, &organiser);
 
 	if (text.value)
@@ -1737,7 +1761,7 @@ popup_notification (time_t trigger,
 		notify_init (_("Evolution Reminders"));
 
 	/* get a sensible description for the event */
-	e_cal_component_get_summary (comp, &text);
+	alarm_queue_get_alarm_summary (comp, qa->instance, &text);
 	e_cal_component_get_organizer (comp, &organiser);
 
 	if (text.value)
