Fix AND combination of empty key with standard key.2009W27

1 files changed, 1 insertions, 1 deletions

diff --git a/src/libraries/qtopiamail/mailkeyimpl_p.h b/src/libraries/qtopiamail/mailkeyimpl_p.h
index cb574a1d..72ebcdd9 100644
--- a/src/libraries/qtopiamail/mailkeyimpl_p.h
+++ b/src/libraries/qtopiamail/mailkeyimpl_p.h
@@ -181,7 +181,7 @@ Key MailKeyImpl<Key>::andCombine(const Key &self, const Key &other)
     if (self.isNonMatching()) {
         return self;
     } else if (self.isEmpty()) {
-        return (other.isNonMatching() ? other : self);
+        return other;
     } else if (other.isNonMatching()) {
         return other;
     } else if (other.isEmpty()) {