diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index e8b7cbcf28..a0b1fa0fb2 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -367,7 +367,7 @@ public class MailService implements AutoCloseable {
 
     public void close() throws MessagingException {
         try {
-            if (iservice != null)
+            if (iservice != null && iservice.isConnected())
                 iservice.close();
         } finally {
             context = null;