diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 159d961816..a27ae0c691 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -97,7 +97,9 @@ public class MmsSmsDatabase extends Database {
 
       while ((messageRecord = reader.getNext()) != null) {
         if ((Util.isOwnNumber(context, serializedAuthor) && messageRecord.isOutgoing()) ||
-                (!Util.isOwnNumber(context, serializedAuthor) && messageRecord.getIndividualRecipient().getAddress().equals(serializedAuthor)))
+                (!Util.isOwnNumber(context, serializedAuthor)
+                        && messageRecord.getIndividualRecipient().getAddress().serialize().equals(serializedAuthor)
+                ))
         {
           return messageRecord;
         }