diff --git a/lib/controllers/mail_client_controller.dart b/lib/controllers/mail_client_controller.dart
index c0a6749..f4e2568 100644
--- a/lib/controllers/mail_client_controller.dart
+++ b/lib/controllers/mail_client_controller.dart
@@ -16,9 +16,7 @@ class MailClientController extends AutoDisposeAsyncNotifier<MailClient> {
       password: (await File(settings.smtpPasswordFile).readAsString()).trim(),
     );
 
-    final client = MailClient(account, isLogEnabled: true);
-    await client.connect();
-    return client;
+    return MailClient(account, isLogEnabled: true);
   }
 
   Future<void> sendMessage({
@@ -30,7 +28,9 @@ class MailClientController extends AutoDisposeAsyncNotifier<MailClient> {
     final client = await future;
     final settings = ref.watch(SettingsController.provider)!;
 
-    return await client.sendMessageBuilder(
+    await client.connect();
+
+    await client.sendMessageBuilder(
       MessageBuilder.prepareMultipartAlternativeMessage(
           plainText: plainText,
           htmlText: markdownToHtml(markdown),
@@ -41,6 +41,8 @@ class MailClientController extends AutoDisposeAsyncNotifier<MailClient> {
         ]
         ..to = [to],
     );
+
+    await client.disconnect();
   }
 
   static final provider =