diff --git a/deltachat-repl/src/main.rs b/deltachat-repl/src/main.rs
index 72f7f0f60..6534b8ab5 100644
--- a/deltachat-repl/src/main.rs
+++ b/deltachat-repl/src/main.rs
@@ -354,7 +354,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
             match readline {
                 Ok(line) => {
                     rl.add_history_entry(line.as_str())?;
-                    let should_continue = spawn_named_blocking_task!("repl:handle_cmd", async {
+                    let should_continue = Handle::current().block_on(async {
                         match handle_cmd(line.trim(), ctx.clone(), &mut selected_chat).await {
                             Ok(ExitResult::Continue) => true,
                             Ok(ExitResult::Exit) => {
diff --git a/src/pgp.rs b/src/pgp.rs
index c8d369e4d..d063f0860 100644
--- a/src/pgp.rs
+++ b/src/pgp.rs
@@ -16,7 +16,6 @@ use pgp::crypto::hash::HashAlgorithm;
 use pgp::crypto::sym::SymmetricKeyAlgorithm;
 use pgp::types::{CompressionAlgorithm, KeyTrait, Mpi, PublicKeyTrait, StringToKey};
 use rand::{thread_rng, CryptoRng, Rng};
-use tokio::runtime::Handle;
 
 use crate::constants::KeyGenType;
 use crate::key::{DcKey, Fingerprint};