diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a1441f818d..75c0a5bdea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -514,6 +514,13 @@
         </intent-filter>
     </receiver>
 
+    <receiver android:name=".service.BootReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            <action android:name="org.thoughtcrime.securesms.RESTART"/>
+        </intent-filter>
+    </receiver>
+
     <receiver android:name=".service.DirectoryRefreshListener">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/src/org/thoughtcrime/securesms/service/BootReceiver.java b/src/org/thoughtcrime/securesms/service/BootReceiver.java
new file mode 100644
index 0000000000..d654b2c62f
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/service/BootReceiver.java
@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.service;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class BootReceiver extends BroadcastReceiver {
+
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    Intent messageRetrievalService = new Intent(context, MessageRetrievalService.class);
+    context.startService(messageRetrievalService);
+  }
+
+}
diff --git a/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java b/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java
index 4cbcdd1933..51698d8df9 100644
--- a/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java
+++ b/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java
@@ -87,6 +87,8 @@ public class MessageRetrievalService extends Service implements InjectableType,
     if (retrievalThread != null) {
       retrievalThread.stopThread();
     }
+
+    sendBroadcast(new Intent("org.thoughtcrime.securesms.RESTART"));
   }
 
   @Override
@@ -236,7 +238,7 @@ public class MessageRetrievalService extends Service implements InjectableType,
       Log.w(TAG, "Exiting...");
     }
 
-    public void stopThread() {
+    private void stopThread() {
       stopThread.set(true);
     }