diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index e973392e4f..3e6a7cbeb5 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -180,8 +180,9 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
             }
         });
 
-        lastActive = ConnectionHelper.getActiveNetwork(this);
-        lastSuitable = ConnectionHelper.getNetworkState(this).isSuitable();
+        ConnectionHelper.NetworkState state = ConnectionHelper.getNetworkState(this);
+        lastActive = state.getActive();
+        lastSuitable = state.isSuitable();
         if (lastSuitable)
             owner.start();