diff --git a/src/org/thoughtcrime/securesms/service/MmsSender.java b/src/org/thoughtcrime/securesms/service/MmsSender.java
index 65dd948690..2537816a5b 100644
--- a/src/org/thoughtcrime/securesms/service/MmsSender.java
+++ b/src/org/thoughtcrime/securesms/service/MmsSender.java
@@ -40,8 +40,6 @@ import org.whispersystems.textsecure.crypto.MasterSecret;
 import ws.com.google.android.mms.MmsException;
 import ws.com.google.android.mms.pdu.SendReq;
 
-import static org.thoughtcrime.securesms.database.SmsDatabase.Status;
-
 public class MmsSender {
 
   private final Context             context;
diff --git a/src/org/thoughtcrime/securesms/service/SmsSender.java b/src/org/thoughtcrime/securesms/service/SmsSender.java
index e0c2624157..197d8c7876 100644
--- a/src/org/thoughtcrime/securesms/service/SmsSender.java
+++ b/src/org/thoughtcrime/securesms/service/SmsSender.java
@@ -94,6 +94,7 @@ public class SmsSender {
           DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
         } catch (RetryLaterException rle) {
           Log.w("SmsSender", rle);
+          DatabaseFactory.getSmsDatabase(context).markAsOutbox(messageId);
           if (systemStateListener.isConnected()) scheduleQuickRetryAlarm();
           else                                   systemStateListener.registerForConnectivityChange();
         }