1 files changed, 11 insertions, 1 deletions

diff --git a/libsylph/imap.c b/libsylph/imap.c
index aa0d737..a61dc2b 100644
--- a/libsylph/imap.c
+++ b/libsylph/imap.c
@@ -707,7 +707,17 @@ static gint imap_session_connect(IMAPSession *session)
         log_message(_("creating IMAP4 connection to %s:%d ...\n"),
                     SESSION(session)->server, SESSION(session)->port);
 
-        pass = account->passwd;
+    if (account->master_password != NULL) {
+        if (decrypt_data(&pass,
+                         account->passwd,
+                         account->master_password,
+                         strlen(account->passwd)) != RC_OK) {
+            session_destroy(session);
+            return -1;
+        }
+    } else {
+        pass = account->passwd;
+    }
         if (!pass)
                 pass = account->tmp_pass;
         if (!pass) {