diff --git a/src/memory/sqlite.py b/src/memory/sqlite.py
index 26f8ee47..f2c6128f 100644
--- a/src/memory/sqlite.py
+++ b/src/memory/sqlite.py
@@ -229,10 +229,10 @@ class SqliteStorage(object):
             return '%s=?' % (type_, )
 
         if between:
-            query_parts.append("(%s OR %s) AND (%s or %s)" % (test_jid('source', from_jid),
-                                                              test_jid('source', to_jid),
-                                                              test_jid('dest', to_jid),
-                                                              test_jid('dest', from_jid)))
+            query_parts.append("((%s AND %s) OR (%s AND %s))" % (test_jid('source', from_jid),
+                                                             test_jid('dest', to_jid),
+                                                             test_jid('source', to_jid),
+                                                             test_jid('dest', from_jid)))
         else:
             query_parts.append("%s AND %s" % (test_jid('source', from_jid),
                                               test_jid('dest', to_jid)))