diff --git a/checkin_notes b/checkin_notes
index 6e41269469..0184cfcce6 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1626,3 +1626,12 @@ Rom    Feb 25 2008
         
     clientgui/
         AdvancedFrame.cpp
+
+Charlie Feb 25 2008
+    - MGR: When connecting to a different host, delete all old messages in 
+        message pane (from previously connected client) before getting new 
+        messages.
+        
+    clientgui/
+        sg_DlgMessages.cpp
+        ViewMessages.cpp
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index 88416dd55d..a38f55f33e 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -247,7 +247,8 @@ void CViewMessages::OnListRender (wxTimerEvent& event) {
                     m_pMessageInfoAttr->SetTextColour(wxColour(128, 128, 128));
                     m_pMessageErrorAttr->SetTextColour(wxColour(255, 128, 128));
                 }
-                // Force an update
+                // Force a complete update
+                m_pListPane->DeleteAllItems();
                 m_pListPane->SetItemCount(iDocCount);
            }
             
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index 477fa649f4..2e6c026b10 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -368,7 +368,8 @@ void CPanelMessages::OnRefresh(wxTimerEvent& event) {
                     m_pMessageInfoAttr->SetTextColour(wxColour(128, 128, 128));
                     m_pMessageErrorAttr->SetTextColour(wxColour(255, 128, 128));
                 }
-                // Force an update
+                // Force a complete update
+                m_pList->DeleteAllItems();
                 m_pList->SetItemCount(iDocCount);
            }