diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 9e9aa00..aa0b04d 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -33,7 +33,7 @@
 #include "config-data.h"
 #include "util.h"
 #include "e-util/e-util-private.h"
-
+#include "misc/e-buffer-tagger.h"
 
 
 enum {
@@ -288,6 +288,8 @@ notified_alarms_dialog_new (void)
 		return NULL;
 	}
 
+	e_buffer_tagger_connect (GTK_TEXT_VIEW (an->description));
+
 	gtk_tree_view_set_model (GTK_TREE_VIEW(an->treeview), model);
 
 	gtk_window_set_keep_above (GTK_WINDOW (an->dialog), TRUE);
@@ -449,6 +451,7 @@ fill_in_labels (AlarmNotify *an, const gchar *summary, const gchar *description,
 	gtk_text_buffer_set_text (buffer, description, -1);
 	gtk_text_view_set_buffer (GTK_TEXT_VIEW (an->description), buffer);
 	gtk_label_set_text (GTK_LABEL (an->location), location);
+	e_buffer_tagger_update_tags (GTK_TEXT_VIEW (an->description));
 	g_object_unref (table);
 	g_object_unref (buffer);
 }
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index f43dcc1..55948f8 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -42,6 +42,7 @@
 #include "e-util/e-popup.h"
 #include "misc/e-dateedit.h"
 #include "misc/e-send-options.h"
+#include "misc/e-buffer-tagger.h"
 #include <libecal/e-cal-time-util.h>
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
@@ -479,6 +480,7 @@ clear_widgets (EventPage *epage)
 	e_dialog_editable_set (priv->summary, NULL);
 	e_dialog_editable_set (priv->location, NULL);
 	gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), "", 0);
+	e_buffer_tagger_update_tags (GTK_TEXT_VIEW (priv->description));
 
 	/* Start and end times */
 	g_signal_handlers_block_matched (priv->start_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
@@ -954,8 +956,12 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 		dtext = l->data;
 		gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)),
 					  dtext->value ? dtext->value : "", -1);
+	} else {
+		gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)),
+					  "", 0);
 	}
 	e_cal_component_free_text_list (l);
+	e_buffer_tagger_update_tags (GTK_TEXT_VIEW (priv->description));
 
 	e_cal_get_cal_address (client, &backend_addr, NULL);
 	set_subscriber_info_string (epage, backend_addr);
@@ -2842,6 +2848,8 @@ init_widgets (EventPage *epage)
 
 	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->description), GTK_WRAP_WORD);
 
+	e_buffer_tagger_connect (GTK_TEXT_VIEW (priv->description));
+
 	/* Start and end times */
 	g_signal_connect((priv->start_time), "changed",
 			    G_CALLBACK (start_date_changed_cb), epage);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 0b76d78..4ecc878 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -40,6 +40,7 @@
 #include <libedataserverui/e-name-selector-entry.h>
 #include <libedataserverui/e-name-selector-list.h>
 #include <widgets/misc/e-dateedit.h>
+#include "misc/e-buffer-tagger.h"
 
 #include "common/authentication.h"
 #include "e-util/e-dialog-widgets.h"
@@ -123,6 +124,7 @@ clear_widgets (MemoPage *mpage)
 	view = GTK_TEXT_VIEW (mpage->priv->memo_content);
 	buffer = gtk_text_view_get_buffer (view);
 	gtk_text_buffer_set_text (buffer, "", 0);
+	e_buffer_tagger_update_tags (view);
 
 	/* Classification */
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage));
@@ -225,6 +227,7 @@ memo_page_fill_widgets (CompEditorPage *page,
 					  "", 0);
 	}
 	e_cal_component_free_text_list (l);
+	e_buffer_tagger_update_tags (GTK_TEXT_VIEW (priv->memo_content));
 
 	/* Start Date. */
 	e_cal_component_get_dtstart (comp, &d);
@@ -945,6 +948,7 @@ init_widgets (MemoPage *mpage)
 	view = GTK_TEXT_VIEW (priv->memo_content);
 	buffer = gtk_text_view_get_buffer (view);
 	gtk_text_view_set_wrap_mode (view, GTK_WRAP_WORD);
+	e_buffer_tagger_connect (view);
 
 	/* Categories button */
 	g_signal_connect(
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index faaba68..0e67130 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -37,6 +37,7 @@
 #include <libedataserverui/e-category-completion.h>
 #include <libedataserverui/e-source-combo-box.h>
 #include <misc/e-dateedit.h>
+#include "misc/e-buffer-tagger.h"
 #include <e-util/e-dialog-utils.h>
 #include "common/authentication.h"
 #include "e-util/e-popup.h"
@@ -262,6 +263,7 @@ clear_widgets (TaskPage *tpage)
 	/* Summary, description */
 	e_dialog_editable_set (priv->summary, NULL);
 	gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), "", 0);
+	e_buffer_tagger_update_tags (GTK_TEXT_VIEW (priv->description));
 
 	/* Start, due times */
 	e_date_edit_set_time (E_DATE_EDIT (priv->start_date), 0);
@@ -498,6 +500,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 					  "", 0);
 	}
 	e_cal_component_free_text_list (l);
+	e_buffer_tagger_update_tags (GTK_TEXT_VIEW (priv->description));
 
 	default_zone = calendar_config_get_icaltimezone ();
 
@@ -1871,6 +1874,8 @@ init_widgets (TaskPage *tpage)
 
 	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->description), GTK_WRAP_WORD);
 
+	e_buffer_tagger_connect (GTK_TEXT_VIEW (priv->description));
+
 	/* Dates */
 	g_signal_connect((priv->start_date), "changed",
 			    G_CALLBACK (date_changed_cb), tpage);
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index e40664b..cd6e16c 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -46,6 +46,7 @@ widgetsinclude_HEADERS =			\
 	e-attachment-store.h			\
 	e-attachment-tree-view.h		\
 	e-attachment-view.h			\
+	e-buffer-tagger.h			\
 	e-spinner.c				\
 	e-spinner.h				\
 	e-calendar.h				\
@@ -105,6 +106,7 @@ libemiscwidgets_la_SOURCES =			\
 	e-attachment-store.c			\
 	e-attachment-tree-view.c		\
 	e-attachment-view.c			\
+	e-buffer-tagger.c			\
 	e-calendar-item.c			\
 	e-cell-date-edit.c			\
 	e-cell-percent.c			\
