diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 918b1b2f..01ab1139 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -49,6 +49,7 @@ import com.sun.mail.imap.IMAPFolder;
 import com.sun.mail.imap.IMAPMessage;
 import com.sun.mail.imap.IMAPStore;
 import com.sun.mail.imap.protocol.IMAPProtocol;
+import com.sun.mail.util.FolderClosedIOException;
 import com.sun.mail.util.MailConnectException;
 
 import org.json.JSONArray;
@@ -1329,6 +1330,8 @@ public class ServiceSynchronize extends LifecycleService {
                     Log.w(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
                 } catch (FolderClosedException ex) {
                     throw ex;
+                } catch (FolderClosedIOException ex) {
+                    throw ex;
                 } catch (Throwable ex) {
                     Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
                 }
@@ -1341,6 +1344,8 @@ public class ServiceSynchronize extends LifecycleService {
                         downloadMessage(this, folder, ids[i], (IMAPMessage) imessages[i]);
                     } catch (FolderClosedException ex) {
                         throw ex;
+                    } catch (FolderClosedIOException ex) {
+                        throw ex;
                     } catch (Throwable ex) {
                         Log.e(Helper.TAG, folder.name + " " + ex + "\n" + Log.getStackTraceString(ex));
                     }
@@ -1506,7 +1511,7 @@ public class ServiceSynchronize extends LifecycleService {
         MessageHelper helper = new MessageHelper(imessage);
 
         ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-        boolean metered = cm.isActiveNetworkMetered();
+        boolean metered = (cm == null || cm.isActiveNetworkMetered());
 
         if (!message.content)
             if (!metered || (message.size != null && message.size < MESSAGE_AUTO_DOWNLOAD_SIZE)) {