Index: evolution-data-server/camel/camel-search-sql-sexp.c
===================================================================
--- evolution-data-server/camel/camel-search-sql-sexp.c	(revision 9973)
+++ evolution-data-server/camel/camel-search-sql-sexp.c	(working copy)
@@ -371,7 +371,7 @@
 					value = get_db_safe_string (tstr);
 					g_free (tstr);
 				}
-				str = g_strdup_printf("(%s LIKE %s)", headername, value);
+				str = g_strdup_printf("(%s IS NOT NULL AND %s LIKE %s)", headername, headername, value);
 				g_free(value);
 			}
 		}
