diff --git a/src/com/android/providers/telephony/MmsSmsProvider.java b/src/com/android/providers/telephony/MmsSmsProvider.java
index 3f43609..a6a6e8e 100644
--- a/src/com/android/providers/telephony/MmsSmsProvider.java
+++ b/src/com/android/providers/telephony/MmsSmsProvider.java
@@ -319,7 +319,7 @@
                 String mmsProjection = "pdu._id,thread_id,addr.address,part.text as body,pdu.date";
 
                 String smsQuery = String.format(
-                        "SELECT %s FROM sms WHERE (body LIKE ?) ",
+                        "SELECT %s FROM sms WHERE (address NOTNULL AND body LIKE ?) ",
                         smsProjection);
 
                 // TODO consider whether we're really getting the right addr here (for example, if