diff --git a/src/com/android/email/EmailAddressAdapter.java b/src/com/android/email/EmailAddressAdapter.java
index 45636c0b9..1c18d6d24 100644
--- a/src/com/android/email/EmailAddressAdapter.java
+++ b/src/com/android/email/EmailAddressAdapter.java
@@ -74,9 +74,9 @@ public class EmailAddressAdapter extends ResourceCursorAdapter {
             String filter = DatabaseUtils.sqlEscapeString(constraint.toString() + '%');
 
             StringBuilder s = new StringBuilder();
-            s.append("(people.name LIKE ");
+            s.append("("+People.NAME+" LIKE ");
             s.append(filter);
-            s.append(") OR (contact_methods.data LIKE ");
+            s.append(") OR ("+ContactMethods.DATA+" LIKE ");
             s.append(filter);
             s.append(")");