diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 3bba58c49b2c9c258c5dce3dd20aea3370f15208..fdff71cb4e9b9e2c3f78c0e5cdcda24548cbf68f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -300,6 +300,7 @@ public class XmppConnection implements Runnable {
             this.changeStatus(Account.State.CONNECTING);
             final boolean useTor = mXmppConnectionService.useTorToConnect() || account.isOnion();
             final boolean extended = mXmppConnectionService.showExtendedConnectionOptions();
+            // TODO collapse Tor usage into normal connection code path
             if (useTor) {
                 final var seeOtherHost = this.seeOtherHostResolverResult;
                 final Resolver.Result resume = streamId == null ? null : streamId.location;
@@ -457,6 +458,7 @@ public class XmppConnection implements Runnable {
                         localSocket = new Socket();
                         localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
 
+                        // TODO use result.isDirect() as condition and set encryptionEnabled after
                         if (features.encryptionEnabled) {
                             localSocket = upgradeSocketToTls(localSocket);
                         }