diff --git a/src/org/thoughtcrime/securesms/util/Trimmer.java b/src/org/thoughtcrime/securesms/util/Trimmer.java
index 021c7fb5e..4dd312837 100644
--- a/src/org/thoughtcrime/securesms/util/Trimmer.java
+++ b/src/org/thoughtcrime/securesms/util/Trimmer.java
@@ -25,12 +25,13 @@ public class Trimmer {
     if (!trimmingEnabled)
       return;
 
-    new Thread() {
+    new AsyncTask<Void, Void, Void>() {
       @Override
-      public void run() {
+      protected Void doInBackground(Void... params) {
         DatabaseFactory.getThreadDatabase(context).trimThread(threadId, threadLengthLimit);
+        return null;
       }
-    }.start();
+    }.execute();
   }
 
   private static class TrimmingProgressTask extends AsyncTask<Integer, Integer, Void> implements ThreadDatabase.ProgressListener {