diff --git a/src/cli/main.rs b/src/cli/main.rs
index 914527e..199a206 100644
--- a/src/cli/main.rs
+++ b/src/cli/main.rs
@@ -76,15 +76,15 @@ async fn run(args: Cli) -> Result<()> {
     let config = get_config()?;
     log::trace!("Configuration loaded: {config:#?}");
 
-    let client = GmailClient::new(config.credential_file()).await?;
+    let mut client = GmailClient::new(config.credential_file()).await?;
 
     match args.sub_command {
         SubCmds::Config(config_cli) => config_cli.run(config),
-        SubCmds::Message(list_cli) => list_cli.run(&client).await,
+        SubCmds::Message(list_cli) => list_cli.run(&mut client).await,
         SubCmds::Labels(label_cli) => label_cli.run(client).await,
-        SubCmds::Trash(trash_cli) => trash_cli.run(&client).await,
-        SubCmds::Delete(delete_cli) => delete_cli.run(&client).await,
-        SubCmds::Run(run_cli) => run_cli.run(&client, config).await,
+        SubCmds::Trash(trash_cli) => trash_cli.run(&mut client).await,
+        SubCmds::Delete(delete_cli) => delete_cli.run(&mut client).await,
+        SubCmds::Run(run_cli) => run_cli.run(&mut client, config).await,
     }
 }