diff --git a/ChangeLog b/ChangeLog
index 8da14bc8c..157a4baec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-05  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/generic.js (showConfirmDialog): buttons
+	callbacks must be updated when retrieving dialog box from cache.
+
 2010-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreMailMessageTable.m
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index cdfb5fc9d..2e4e4df9e 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1798,7 +1798,7 @@ function createButton(id, caption, action) {
         span.appendChild(document.createTextNode(caption));
     }
     if (action)
-        newButton.observe("click", action);
+        newButton.on("click", action);
 
     return newButton;
 }
@@ -1838,6 +1838,13 @@ function showConfirmDialog(title, label, callbackYes, callbackNo) {
     var dialog = dialogs[title+label];
     if (dialog) {
         $("bgDialogDiv").show();
+
+	// Update callbacks on buttons
+	var buttons = dialog.getElementsByTagName("a");
+	buttons[0].stopObserving();
+	buttons[0].on("click", callbackYes);
+	buttons[1].stopObserving();
+	buttons[1].on("click", callbackNo || disposeDialog);
     }
     else {
         var fields = createElement("p");