diff --git a/ChangeLog b/ChangeLog
index 128a8f68a..23678ee00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/UIxMailPopupView.js (initPopupMailer): we
+	assign window.messageUID from here now (by concatenating
+	"mailboxName" and "messageName", as it will disappear if the
+	window is reloaded.
+
 2010-04-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/SchedulerUI.js (onDocumentKeydown): when
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 8627ba2e8..9ca44172f 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -59,7 +59,6 @@ function openMessageWindow(msguid, url) {
         markMailReadInWindow(window, msguid);
     }
     var msgWin = openMailComposeWindow(url, wId);
-    msgWin.messageUID = msguid;
     msgWin.focus();
     Mailer.popups.push(msgWin);
 
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index eeb6a3589..311f9ef1d 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -12,6 +12,8 @@ function initPopupMailer(event) {
 
     configureLoadImagesButton();
     configureSignatureFlagImage();
+
+    window.messageUID = mailboxName + "/" + messageName;
 }
 
 function onICalendarButtonClick(event) {