diff --git a/examples/repl/main.rs b/examples/repl/main.rs
index f79988ccb..3b4f47ab5 100644
--- a/examples/repl/main.rs
+++ b/examples/repl/main.rs
@@ -268,13 +268,15 @@ async fn start(args: Vec<String>) -> Result<(), failure::Error> {
     let context = Context::new("CLI".into(), Path::new(&args[1]).to_path_buf()).await?;
 
     let ctx = context.clone();
-    std::thread::spawn(move || loop {
-        if ctx.has_next_event() {
-            if let Ok(event) = ctx.get_next_event() {
-                receive_event(event);
+    async_std::task::spawn(async move {
+        loop {
+            if ctx.has_next_event() {
+                if let Ok(event) = ctx.get_next_event() {
+                    receive_event(event);
+                }
+            } else {
+                async_std::task::sleep(std::time::Duration::from_millis(50)).await;
             }
-        } else {
-            std::thread::sleep(std::time::Duration::from_millis(50));
         }
     });
 
@@ -316,6 +318,7 @@ async fn start(args: Vec<String>) -> Result<(), failure::Error> {
             }
             Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
                 println!("Exiting...");
+                context.stop().await;
                 break;
             }
             Err(err) => {
@@ -324,11 +327,10 @@ async fn start(args: Vec<String>) -> Result<(), failure::Error> {
             }
         }
     }
+
     rl.save_history(".dc-history.txt")?;
     println!("history saved");
 
-    context.stop().await;
-
     Ok(())
 }
 
diff --git a/examples/simple.rs b/examples/simple.rs
index 4474df71b..a94eab63e 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -39,13 +39,15 @@ async fn main() {
     println!("info: {:#?}", info);
 
     let ctx1 = ctx.clone();
-    std::thread::spawn(move || loop {
-        if ctx1.has_next_event() {
-            if let Ok(event) = ctx1.get_next_event() {
-                cb(event);
+    async_std::task::spawn(async move {
+        loop {
+            if ctx1.has_next_event() {
+                if let Ok(event) = ctx1.get_next_event() {
+                    cb(event);
+                }
+            } else {
+                async_std::task::sleep(time::Duration::from_millis(50));
             }
-        } else {
-            std::thread::sleep(time::Duration::from_millis(50));
         }
     });
 
diff --git a/src/context.rs b/src/context.rs
index 879602d4f..85ea121f6 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -128,8 +128,8 @@ impl Context {
     }
 
     pub async fn run(&self) {
-        if self.inner.scheduler.read().await.is_running() {
-            panic!("Already running");
+        if self.is_running().await {
+            return;
         }
 
         let l = &mut *self.inner.scheduler.write().await;
@@ -137,7 +137,7 @@ impl Context {
     }
 
     pub async fn is_running(&self) -> bool {
-        self.inner.scheduler.read().await.is_running()
+        self.inner.is_running().await
     }
 
     pub async fn stop(&self) {
@@ -480,19 +480,21 @@ impl Context {
 }
 
 impl InnerContext {
-    async fn stop(&self) {
-        if self.scheduler.read().await.is_running() {
-            self.scheduler.write().await.stop().await;
-        }
+    async fn is_running(&self) -> bool {
+        self.scheduler.read().await.is_running()
     }
-}
 
-impl Drop for InnerContext {
-    fn drop(&mut self) {
-        async_std::task::block_on(async move {
-            self.stop().await;
-            self.sql.close().await;
-        });
+    async fn stop(&self) {
+        if self.is_running().await {
+            let token = {
+                let lock = &*self.scheduler.read().await;
+                lock.pre_stop().await
+            };
+            {
+                let lock = &mut *self.scheduler.write().await;
+                lock.stop(token).await;
+            }
+        }
     }
 }
 
diff --git a/src/scheduler.rs b/src/scheduler.rs
index 1f17ddb40..3af84f15b 100644
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -9,6 +9,8 @@ use crate::imap::Imap;
 use crate::job::{self, Thread};
 use crate::smtp::Smtp;
 
+pub(crate) struct StopToken;
+
 /// Job and connection scheduler.
 #[derive(Debug)]
 pub(crate) enum Scheduler {
@@ -287,8 +289,8 @@ impl Scheduler {
         }
     }
 
-    /// Halt the scheduler, panics if it is already stopped.
-    pub async fn stop(&mut self) {
+    /// Halts the scheduler, must be called first, and then `stop`.
+    pub(crate) async fn pre_stop(&self) -> StopToken {
         match self {
             Scheduler::Stopped => {
                 panic!("WARN: already stopped");
@@ -306,6 +308,19 @@ impl Scheduler {
                     .join(sentbox.stop())
                     .join(smtp.stop())
                     .await;
+
+                StopToken
+            }
+        }
+    }
+
+    /// Halt the scheduler, must only be called after pre_stop.
+    pub(crate) async fn stop(&mut self, _t: StopToken) {
+        match self {
+            Scheduler::Stopped => {
+                panic!("WARN: already stopped");
+            }
+            Scheduler::Running { .. } => {
                 *self = Scheduler::Stopped;
             }
         }