diff --git a/checkin_notes b/checkin_notes
index c13ee120d0..7708762205 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3923,7 +3923,17 @@ Charlie 17 Apr 2006
 
 Rom    17 Apr 2006
     - Clean up the caching scheme used in the manager
+    - Remove the message cache update for all tabs except
+        the messages tab.
+    - Remove the project update from the work tab.  Use a new flag being
+        introduced to show if the project has been suspended via GUI.
 
     clientgui/
         MainDocument.cpp
         MainFrame.cpp
+        ViewMessages.cpp
+        ViewProjects.cpp
+        ViewResources.cpp
+        ViewStatistics.cpp
+        ViewTransfers.cpp
+        ViewWork.cpp
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index aa413bf02f..014bc398ba 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -631,7 +631,6 @@ int CMainDocument::GetProjectCount() {
     int iCount = -1;
 
     CachedProjectStatusUpdate();
-    CachedMessageUpdate();
     CachedStateUpdate();
 
     if (!state.projects.empty())
@@ -781,9 +780,7 @@ RESULT* CMainDocument::result(unsigned int i) {
 int CMainDocument::GetWorkCount() {
     int iCount = -1;
 
-    CachedProjectStatusUpdate();
     CachedResultsStatusUpdate();
-    CachedMessageUpdate();
     CachedStateUpdate();
 
     if (!results.results.empty())
@@ -989,7 +986,6 @@ int CMainDocument::GetTransferCount() {
     int iCount = 0;
 
     CachedFileTransfersUpdate();
-    CachedMessageUpdate();
     CachedStateUpdate();
 
     if (!ft.file_transfers.empty())
@@ -1073,7 +1069,6 @@ int CMainDocument::GetResourceCount() {
     int iCount = -1;
 
     CachedResourceStatusUpdate();
-    CachedMessageUpdate();
     CachedStateUpdate();
 
     if (!resource_status.projects.empty())
@@ -1132,7 +1127,6 @@ int CMainDocument::GetStatisticsCount() {
     int iCount = -1;
 
     CachedStatisticsStatusUpdate();
-    CachedMessageUpdate();
     CachedStateUpdate();
 
     if (!statistics_status.projects.empty())