diff --git a/src/org/thoughtcrime/securesms/service/SmsListener.java b/src/org/thoughtcrime/securesms/service/SmsListener.java
index 194ba3677a..62f7f58a44 100644
--- a/src/org/thoughtcrime/securesms/service/SmsListener.java
+++ b/src/org/thoughtcrime/securesms/service/SmsListener.java
@@ -31,10 +31,16 @@ public class SmsListener extends BroadcastReceiver {
   private static final String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED";
 
   private boolean isExemption(SmsMessage message, String messageBody) {
-	// ignore OTP messages from Sparebank1 (Norwegian bank)
+
+    // ignore CLASS0 ("flash") messages
+    if (message.getMessageClass() == SmsMessage.MessageClass.CLASS_0)
+      return true;
+
+    // ignore OTP messages from Sparebank1 (Norwegian bank)
     if (messageBody.startsWith("Sparebank1://otp?")) {
-      return (true);
-    }	  
+      return true;
+    }
+    
     // Sprint Visual Voicemail
     return 
       message.getOriginatingAddress().length() < 7 &&