From 8999e5fc54a90c78ed7fdfb1362f03348cc15f82 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Wed, 3 Jun 2015 15:05:10 -0700
Subject: [PATCH] fix messages with push flag *and* sms flag set...

// FREEBIE
---
 .../thoughtcrime/securesms/database/model/MessageRecord.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
index 112e646ab8..161a4ad883 100644
--- a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -135,7 +135,7 @@ public abstract class MessageRecord extends DisplayRecord {
   }
 
   public boolean isPush() {
-    return SmsDatabase.Types.isPushType(type);
+    return SmsDatabase.Types.isPushType(type) && !SmsDatabase.Types.isForcedSms(type);
   }
 
   public boolean isForcedSms() {