diff --git a/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp b/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp
index 397031113b5..f78866e028f 100644
--- a/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp
@@ -273,14 +273,10 @@ nsresult nsMsgSearchValidityManager::InitOfflineMailTable ()
         m_offlineMailTable->SetAvailable (nsMsgSearchAttrib::AgeInDays, nsMsgSearchOp::Is,  1);
         m_offlineMailTable->SetEnabled   (nsMsgSearchAttrib::AgeInDays, nsMsgSearchOp::Is, 1);
 
-        m_offlineMailTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);   // added for arbitrary headers
-        m_offlineMailTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);
-        m_offlineMailTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
-        m_offlineMailTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
-        m_offlineMailTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Is, 1);
-        m_offlineMailTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Is, 1);
-        m_offlineMailTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Isnt, 1);
-        m_offlineMailTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Isnt, 1);
+        m_offlineMailTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);   // added for arbitrary headers
+        m_offlineMailTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
+        m_offlineMailTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Is, 1);
+        m_offlineMailTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Isnt, 1);
 
     }
 
@@ -346,10 +342,8 @@ nsresult nsMsgSearchValidityManager::InitOnlineMailTable ()
         m_onlineMailTable->SetEnabled   (nsMsgSearchAttrib::AgeInDays, nsMsgSearchOp::Is, 1);
         m_onlineMailTable->SetAvailable (nsMsgSearchAttrib::AgeInDays, nsMsgSearchOp::Is, 1);
 
-        m_onlineMailTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);   // added for arbitrary headers
-        m_onlineMailTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);
-        m_onlineMailTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
-        m_onlineMailTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
+        m_onlineMailTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);   // added for arbitrary headers
+        m_onlineMailTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
 
     }
 
@@ -458,16 +452,12 @@ nsresult nsMsgSearchValidityManager::InitOnlineMailFilterTable ()
         m_onlineMailFilterTable->SetValidButNotShown (nsMsgSearchAttrib::AgeInDays, nsMsgSearchOp::IsLessThan,  1);
         m_onlineMailFilterTable->SetValidButNotShown (nsMsgSearchAttrib::AgeInDays, nsMsgSearchOp::Is, 1);
 
-        m_onlineMailFilterTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);   // added for arbitrary headers
-        m_onlineMailFilterTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);
-        m_onlineMailFilterTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
-        m_onlineMailFilterTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
-        m_onlineMailFilterTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Is, 1);
-        m_onlineMailFilterTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Is, 1);
-        m_onlineMailFilterTable->SetAvailable (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Isnt, 1);
-        m_onlineMailFilterTable->SetEnabled   (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Isnt, 1);
+        m_onlineMailFilterTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Contains, 1);   // added for arbitrary headers
+        m_onlineMailFilterTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::DoesntContain, 1);
+        m_onlineMailFilterTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Is, 1);
+        m_onlineMailFilterTable->SetValidButNotShown (nsMsgSearchAttrib::OtherHeader, nsMsgSearchOp::Isnt, 1);
 
-    }
+	}
 
     return err;
 }