diff --git a/src/command.rs b/src/command.rs
new file mode 100644
index 0000000..56291ad
--- /dev/null
+++ b/src/command.rs
@@ -0,0 +1,41 @@
+use std::sync::Arc;
+
+use boitalettres::errors::Error as BalError;
+use boitalettres::proto::{Request, Response};
+use imap_codec::types::core::AString;
+use imap_codec::types::response::{Capability, Data};
+
+use crate::mailstore;
+
+pub struct Command {
+    mailstore: Arc<mailstore::Mailstore>,
+}
+
+impl Command {
+    pub fn new(mailstore: Arc<mailstore::Mailstore>) -> Self {
+        Self { mailstore }
+    }
+
+    pub async fn capability(self) -> Result<Response, BalError> {
+        let capabilities = vec![Capability::Imap4Rev1, Capability::Idle];
+        let body = vec![Data::Capability(capabilities)];
+        let r = Response::ok("Pre-login capabilities listed, post-login capabilities have more.")?
+            .with_body(body);
+        Ok(r)
+    }
+
+    pub async fn login(self, username: AString, password: AString) -> Result<Response, BalError> {
+        let (u, p) = match (String::try_from(username), String::try_from(password)) {
+            (Ok(u), Ok(p)) => (u, p),
+            _ => return Response::bad("Invalid characters"),
+        };
+
+        tracing::debug!(user = %u, "command.login");
+        let creds = match self.mailstore.login_provider.login(&u, &p).await {
+            Err(_) => return Response::no("[AUTHENTICATIONFAILED] Authentication failed."),
+            Ok(c) => c,
+        };
+
+        Response::ok("Logged in")
+    }
+}
diff --git a/src/connection.rs b/src/connection.rs
index fecb4f4..335caaa 100644
--- a/src/connection.rs
+++ b/src/connection.rs
@@ -4,8 +4,10 @@ use std::task::{Context, Poll};
 use boitalettres::errors::Error as BalError;
 use boitalettres::proto::{Request, Response};
 use futures::future::BoxFuture;
+use imap_codec::types::command::CommandBody;
 use tower::Service;
 
+use crate::command;
 use crate::mailstore::Mailstore;
 
 pub struct Connection {
@@ -27,42 +29,13 @@ impl Service<Request> for Connection {
 
     fn call(&mut self, req: Request) -> Self::Future {
         tracing::debug!("Got request: {:#?}", req);
-        let mailstore = self.mailstore.clone();
+        let cmd = command::Command::new(self.mailstore.clone());
         Box::pin(async move {
-            use imap_codec::types::{
-                command::CommandBody,
-                response::{Capability, Data},
-            };
-
-            let r = match req.body {
-                CommandBody::Capability => {
-                    let capabilities = vec![Capability::Imap4Rev1, Capability::Idle];
-                    let body = vec![Data::Capability(capabilities)];
-                    Response::ok(
-                        "Pre-login capabilities listed, post-login capabilities have more.",
-                    )?
-                    .with_body(body)
-                }
-                CommandBody::Login { username, password } => {
-                    let (u, p) = match (String::try_from(username), String::try_from(password)) {
-                        (Ok(u), Ok(p)) => (u, p),
-                        _ => return Response::bad("Invalid characters"),
-                    };
-
-                    tracing::debug!(user = %u, "command.login");
-                    let creds = match mailstore.login_provider.login(&u, &p).await {
-                        Err(_) => {
-                            return Response::no("[AUTHENTICATIONFAILED] Authentication failed.")
-                        }
-                        Ok(c) => c,
-                    };
-
-                    Response::ok("Logged in")?
-                }
-                _ => Response::bad("Error in IMAP command received by server.")?,
-            };
-
-            Ok(r)
+            match req.body {
+                CommandBody::Capability => cmd.capability().await,
+                CommandBody::Login { username, password } => cmd.login(username, password).await,
+                _ => Response::bad("Error in IMAP command received by server."),
+            }
         })
     }
 }
diff --git a/src/main.rs b/src/main.rs
index abf3a82..62a5d81 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
 mod bayou;
+mod command;
 mod config;
 mod connection;
 mod cryptoblob;