diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 5a4f35e92e..fa2a8eec9d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -675,7 +675,7 @@ public class FragmentIdentity extends FragmentBase {
                     // Create transport
                     String protocol = (starttls ? "smtp" : "smtps");
                     try (MailService iservice = new MailService(context, protocol, realm, insecure, true)) {
-                        iservice.setUseIp(use_ip, host);
+                        iservice.setUseIp(use_ip);
                         iservice.connect(host, Integer.parseInt(port), user, password);
                     }
                 }
diff --git a/app/src/main/java/eu/faircode/email/MailService.java b/app/src/main/java/eu/faircode/email/MailService.java
index 9010442456..9595f469b0 100644
--- a/app/src/main/java/eu/faircode/email/MailService.java
+++ b/app/src/main/java/eu/faircode/email/MailService.java
@@ -25,7 +25,7 @@ import javax.mail.Session;
 public class MailService implements AutoCloseable {
     private Context context;
     private String protocol;
-    private boolean insecure;
+    private boolean useip;
     private boolean debug;
     private Properties properties;
     private Session isession;
@@ -45,7 +45,6 @@ public class MailService implements AutoCloseable {
     MailService(Context context, String protocol, String realm, boolean insecure, boolean debug) throws NoSuchProviderException {
         this.context = context.getApplicationContext();
         this.protocol = protocol;
-        this.insecure = insecure;
         this.debug = debug;
         this.properties = MessageHelper.getSessionProperties();
 
@@ -116,19 +115,8 @@ public class MailService implements AutoCloseable {
             this.properties.put("mail." + this.protocol + ".partialfetch", "false");
     }
 
-    void setUseIp(boolean enabled, String host) throws UnknownHostException {
-        String haddr;
-        if (enabled) {
-            InetAddress addr = InetAddress.getByName(host);
-            if (addr instanceof Inet4Address)
-                haddr = "[" + Inet4Address.getLocalHost().getHostAddress() + "]";
-            else
-                haddr = "[IPv6:" + Inet6Address.getLocalHost().getHostAddress() + "]";
-        } else
-            haddr = host;
-
-        Log.i("Send localhost=" + haddr);
-        this.properties.put("mail." + this.protocol + ".localhost", haddr);
+    void setUseIp(boolean enabled) {
+        this.useip = enabled;
     }
 
     void setSeparateStoreConnection() {
@@ -199,6 +187,23 @@ public class MailService implements AutoCloseable {
                 }
 
         } else if ("smtp".equals(protocol) || "smtps".equals(protocol)) {
+            String haddr = host;
+
+            if (useip)
+                try {
+                    // This assumes getByName always returns the same address (type)
+                    InetAddress addr = InetAddress.getByName(host);
+                    if (addr instanceof Inet4Address)
+                        haddr = "[" + Inet4Address.getLocalHost().getHostAddress() + "]";
+                    else
+                        haddr = "[IPv6:" + Inet6Address.getLocalHost().getHostAddress() + "]";
+                } catch (UnknownHostException ex) {
+                    Log.w(ex);
+                }
+
+            Log.i("Using localhost=" + haddr);
+            this.properties.put("mail." + this.protocol + ".localhost", haddr);
+
             iservice = isession.getTransport(protocol);
             iservice.connect(host, port, user, password);
         } else
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index ca0a992440..d2d7d4759e 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -339,7 +339,7 @@ public class ServiceSend extends ServiceBase {
         // Create transport
         try (MailService iservice = new MailService(
                 this, ident.getProtocol(), ident.realm, ident.insecure, debug)) {
-            iservice.setUseIp(ident.use_ip, ident.host);
+            iservice.setUseIp(ident.use_ip);
 
             // Connect transport
             db.identity().setIdentityState(ident.id, "connecting");