diff --git a/ChangeLog b/ChangeLog
index 3fe24d036..dc52d445a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-15  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js (refreshMailbox): now calls
+	refreshUnseenCounts so the unseen count is updated when the user
+	clicks on the "Get Mail" button.
+
 2010-11-12  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (messageFlagCallback): now
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 81bf857a5..2a9ea72f0 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -662,8 +662,10 @@ function onMailboxMenuCopy(event) {
 
 function refreshMailbox() {
     var topWindow = getTopWindow();
-    if (topWindow)
+    if (topWindow) {
         topWindow.refreshCurrentFolder();
+        topWindow.refreshUnseenCounts();
+    }
     
     return false;
 }
@@ -1868,7 +1870,6 @@ function initMessageCheckTimer() {
 
 function onMessageCheckCallback(event) {
     refreshMailbox();
-    refreshUnseenCounts();
 }
 
 function initMailboxTree() {