diff --git a/src/mu-query.cc b/src/mu-query.cc
index 4f3212d8..341a39d0 100644
--- a/src/mu-query.cc
+++ b/src/mu-query.cc
@@ -45,6 +45,11 @@ public:
 
 		if (!clear_prefix (begin))
 			return Xapian::BAD_VALUENO;
+
+		// now and begin should only appear at the end, so
+		// correct them...
+		if (begin == "today" || begin == "now")
+			std::swap (begin, end);
 		
 		substitute_date (begin);
 		substitute_date (end);