diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index 6f34b61f82..4e224e48d9 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -288,12 +288,12 @@ void CViewMessages::OnMessagesFilter( wxCommandEvent& WXUNUSED(event) ) {
                 m_bIsFiltered = true;
                 for (iIndex = 0; iIndex < m_iTotalDocCount; iIndex++) {
                     message = wxGetApp().GetDocument()->message(iIndex);
-                    if (message->project == m_strFilteredProjectName) {
+                    if (message->project.empty() || (message->project == m_strFilteredProjectName)) {
                         m_iFilteredIndexes.Add(iIndex);
                     }
 
                 }
-            m_iFilteredDocCount = (int)(m_iFilteredIndexes.GetCount());
+                m_iFilteredDocCount = (int)(m_iFilteredIndexes.GetCount());
            }
         }
     }