diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt
index 300e235dac507a32d253b64e884fd672b0520d41..e3d267ee869c958661d089d48080100cae43d54d 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt
@@ -26,6 +26,8 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.IntentFilter
 import android.os.IBinder
+import androidx.core.app.ServiceCompat
+import androidx.core.app.ServiceCompat.stopForeground
 import androidx.core.content.ContextCompat
 import dagger.hilt.android.AndroidEntryPoint
 import org.briarproject.mailbox.R
@@ -156,7 +158,7 @@ class MailboxService : Service() {
     override fun onDestroy() {
         super.onDestroy()
         LOG.info("Destroyed")
-        stopForeground(true)
+        stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         if (receiver != null) unregisterReceiver(receiver)
         if (started) {
             androidExecutor.runOnBackgroundThread {
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt b/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt
index 455321245797ae82a040439dc1bfff4157056ba5..78ed570c126f163e294ee1f2c2a4648c91c54686 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt
@@ -25,6 +25,7 @@ import android.graphics.Bitmap
 import androidx.annotation.StringRes
 import androidx.annotation.UiThread
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.GlobalScope
@@ -60,6 +61,7 @@ import javax.inject.Singleton
 import kotlin.math.min
 
 @Singleton
+@OptIn(DelicateCoroutinesApi::class)
 class StatusManager @Inject constructor(
     @ApplicationContext private val context: Context,
     lifecycleManager: LifecycleManager,