diff --git a/checkin_notes b/checkin_notes
index 0f57017202..16b5ab443b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -23931,9 +23931,12 @@ Rom    3 Feb 2005
     - Bug Fix: In the transfers tab, replace upload with transfer.
     - Bug Fix: In the work tab, replace "Quick Tips" with just "Tips"
         to be consistent with the rest of the tabs.
+    - Bug Fix: Additional check to see if any new messages have been added
+        before changing the visible messages in the message tab.
 
     client/win/
         win_screensaver.cpp, .h
     clientgui/
         ViewWork.cpp
         ViewTransfers.cpp
+        ViewMessages.cpp
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index 99190c1e99..1f3b0e6ffc 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -182,15 +182,15 @@ void CViewMessages::OnListRender ( wxTimerEvent& event )
         else
         {
             if ( m_iPreviousDocCount != iDocCount )
-            {
                 m_pListPane->SetItemCount( iDocCount );
-                m_iPreviousDocCount = iDocCount;
-            }
         }
 
-        if ( _EnsureLastItemVisible() && iDocCount )
+        if ( (iDocCount) && (_EnsureLastItemVisible()) && (m_iPreviousDocCount != iDocCount) )
             m_pListPane->EnsureVisible( iDocCount - 1 );
 
+        if ( m_iPreviousDocCount != iDocCount )
+            m_iPreviousDocCount = iDocCount;
+
         m_bProcessingListRenderEvent = false;
     }