diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 4886c768c7..53ded94af1 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -1331,7 +1331,7 @@ public class MmsDatabase extends MessagingDatabase {
         long revealStartTime = cursor.getLong(cursor.getColumnIndexOrThrow(REVEAL_START_TIME));
         long dateReceived    = cursor.getLong(cursor.getColumnIndexOrThrow(DATE_RECEIVED));
         long expiresAt       = revealStartTime > 0 ? revealStartTime + revealDuration
-                                                    : dateReceived + RevealableUtil.MAX_LIFESPAN;
+                                                   : dateReceived + RevealableUtil.MAX_LIFESPAN;
 
         if (info == null || expiresAt < nearestExpiration) {
           info              = new RevealExpirationInfo(id, dateReceived, revealStartTime, revealDuration);
diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 88f98c389d..5879eebd2d 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -467,7 +467,6 @@ public class MessageNotifier {
         slideDeck = ((MmsMessageRecord) record).getSlideDeck();
       } else if (record.isMms() && ((MmsMessageRecord) record).getRevealDuration() > 0) {
         body = SpanUtil.italic(context.getString(R.string.MessageNotifier_disappearing_photo));
-        slideDeck = ((MmsMessageRecord) record).getSlideDeck();
       } else if (record.isMms() && TextUtils.isEmpty(body) && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) {
         body = SpanUtil.italic(context.getString(R.string.MessageNotifier_media_message));
         slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck();
diff --git a/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java b/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
index 9d6ec868a2..cda737ebb3 100644
--- a/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
+++ b/src/org/thoughtcrime/securesms/revealable/RevealableMessageManager.java
@@ -61,7 +61,10 @@ public class RevealableMessageManager extends TimedEventManager<RevealExpiration
   @Override
   protected long getDelayForEvent(@NonNull RevealExpirationInfo event) {
     if (event.getRevealStartTime() == 0) {
-      return event.getReceiveTime() + RevealableUtil.MAX_LIFESPAN;
+      long expiresAt = event.getReceiveTime() + RevealableUtil.MAX_LIFESPAN;
+      long timeLeft  = expiresAt - System.currentTimeMillis();
+
+      return Math.max(0, timeLeft);
     } else {
       long timeSinceStart = System.currentTimeMillis() - event.getRevealStartTime();
       long timeLeft       = event.getRevealDuration() - timeSinceStart;