diff --git a/README.md b/README.md
index aae81dc..c072306 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,6 @@ himalaya --help
 ```
 
 ```help
-Himalaya 0.1.0
-soywod <clement.douin@posteo.net>
 📫 Minimalist CLI email client
 
 USAGE:
@@ -21,8 +19,10 @@ FLAGS:
 SUBCOMMANDS:
     forward    Forwards an email by its UID
     help       Prints this message or the help of the given subcommand(s)
-    query      Prints emails filtered by the given IMAP query
+    list       Lists all available mailboxes
     read       Reads an email by its UID
     reply      Replies to an email by its UID
+    search     Lists emails matching the given IMAP query
+    send       Send a draft by its UID
     write      Writes a new email
 ```
diff --git a/src/main.rs b/src/main.rs
index dc7c565..a81c195 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -104,11 +104,9 @@ fn run() -> Result<()> {
                         .default_value("text/plain"),
                 ),
         )
-        .subcommand(SubCommand::with_name("write").about("Writes a new email"))
         .subcommand(
-            SubCommand::with_name("forward")
-                .about("Forwards an email by its UID")
-                .arg(uid_arg())
+            SubCommand::with_name("write")
+                .about("Writes a new email")
                 .arg(mailbox_arg()),
         )
         .subcommand(
@@ -123,6 +121,17 @@ fn run() -> Result<()> {
                         .long("all"),
                 ),
         )
+        .subcommand(
+            SubCommand::with_name("forward")
+                .about("Forwards an email by its UID")
+                .arg(uid_arg())
+                .arg(mailbox_arg()),
+        )
+        .subcommand(
+            SubCommand::with_name("send")
+                .about("Send a draft by its UID")
+                .arg(uid_arg()),
+        )
         .get_matches();
 
     if let Some(_) = matches.subcommand_matches("list") {
@@ -184,11 +193,24 @@ fn run() -> Result<()> {
         let config = Config::new_from_file()?;
         let draft = editor::open_with_new_template()?;
 
+        // TODO: save as draft instead (IMAP)
         println!("Sending ...");
         smtp::send(&config, draft.as_bytes());
         println!("Done!");
     }
 
+    if let Some(_) = matches.subcommand_matches("reply") {
+        // TODO
+    }
+
+    if let Some(_) = matches.subcommand_matches("forward") {
+        // TODO
+    }
+
+    if let Some(_) = matches.subcommand_matches("send") {
+        // TODO
+    }
+
     Ok(())
 }