diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7478ebc6cb..68b20722a4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -526,6 +526,8 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name=".service.ExpirationListener" />
+
 
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 6544a10516..f76958a24a 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -559,6 +559,10 @@ public class ConversationItem extends LinearLayout
         this.expirationTimer.setExpirationTime(messageRecord.getExpireStarted(),
                                                messageRecord.getExpiresIn());
         this.expirationTimer.startAnimation();
+
+        if (messageRecord.getExpireStarted() + messageRecord.getExpiresIn() <= System.currentTimeMillis()) {
+          ApplicationContext.getInstance(context).getExpiringMessageManager().checkSchedule();
+        }
       } else if (!messageRecord.isOutgoing() && !messageRecord.isMediaPending()) {
         new AsyncTask<Void, Void, Void>() {
           @Override
diff --git a/src/org/thoughtcrime/securesms/service/ExpirationListener.java b/src/org/thoughtcrime/securesms/service/ExpirationListener.java
index 97513bcde8..4a83707ddd 100644
--- a/src/org/thoughtcrime/securesms/service/ExpirationListener.java
+++ b/src/org/thoughtcrime/securesms/service/ExpirationListener.java
@@ -21,6 +21,6 @@ public class ExpirationListener extends BroadcastReceiver {
     AlarmManager  alarmManager  = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
 
     alarmManager.cancel(pendingIntent);
-    alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + waitTimeMillis, pendingIntent);
+    alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + waitTimeMillis, pendingIntent);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
index 2cc4674fee..b43cf0e7d1 100644
--- a/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
+++ b/src/org/thoughtcrime/securesms/service/ExpiringMessageManager.java
@@ -46,7 +46,7 @@ public class ExpiringMessageManager {
     }
   }
 
-  void checkSchedule() {
+  public void checkSchedule() {
     synchronized (expiringMessageReferences) {
       expiringMessageReferences.notifyAll();
     }