diff --git a/mozilla/mail/base/content/searchBar.js b/mozilla/mail/base/content/searchBar.js
index c6e4329a927..8abf633e9b6 100644
--- a/mozilla/mail/base/content/searchBar.js
+++ b/mozilla/mail/base/content/searchBar.js
@@ -335,7 +335,10 @@ function createSearchTermsWithList(aTermsArray)
   var ioService = Components.classes["@mozilla.org/network/io-service;1"]
                   .getService(Components.interfaces.nsIIOService);
 
-  gSearchSession.addScopeTerm(gSearchInput.searchMode == kQuickSearchBody && !ioService.offline ? nsMsgSearchScope.onlineMail : nsMsgSearchScope.offlineMail, selectedFolder);
+  gSearchSession.addScopeTerm(gSearchInput.searchMode == kQuickSearchBody && 
+                              !ioService.offline && 
+                              selectedFolder.server.type == 'imap' ? nsMsgSearchScope.onlineMail : nsMsgSearchScope.offlineMail, 
+                              selectedFolder);
 
   // add each item in termsArray to the search session