diff --git a/core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java b/core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
index 2ed0e907c2..7cf769d06d 100644
--- a/core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
+++ b/core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
@@ -143,7 +143,7 @@ public class WalletsSetup {
         backupWallets();
 
         final Socks5Proxy socks5Proxy = preferences.getUseTorForBitcoinJ() ? socks5ProxyProvider.getSocks5Proxy() : null;
-        log.info("Use socks5Proxy for bitcoinj: " + socks5Proxy);
+        log.info("Socks5Proxy for bitcoinj: socks5Proxy=" + socks5Proxy);
 
         walletConfig = new WalletConfig(params, socks5Proxy, walletDir, bisqEnvironment, btcWalletFileName,
                 BSQ_WALLET_FILE_NAME, SPV_CHAIN_FILE_NAME) {
diff --git a/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityRequest.java b/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityRequest.java
index 1cb36befb4..0c79957c88 100644
--- a/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityRequest.java
+++ b/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityRequest.java
@@ -17,6 +17,7 @@
 
 package io.bisq.core.offer.messages;
 
+import io.bisq.common.app.Capabilities;
 import io.bisq.common.app.Version;
 import io.bisq.common.crypto.PubKeyRing;
 import io.bisq.generated.protobuffer.PB;
@@ -41,7 +42,7 @@ public final class OfferAvailabilityRequest extends OfferMessage implements Supp
     public OfferAvailabilityRequest(String offerId,
                                     PubKeyRing pubKeyRing,
                                     long takersTradePrice) {
-        this(offerId, pubKeyRing, takersTradePrice, null, Version.getP2PMessageVersion());
+        this(offerId, pubKeyRing, takersTradePrice, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
     }
 
 
diff --git a/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityResponse.java b/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityResponse.java
index 1a8ec9f223..94f1103ff4 100644
--- a/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityResponse.java
+++ b/core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityResponse.java
@@ -18,6 +18,7 @@
 package io.bisq.core.offer.messages;
 
 
+import io.bisq.common.app.Capabilities;
 import io.bisq.common.app.Version;
 import io.bisq.common.proto.ProtoUtil;
 import io.bisq.core.offer.AvailabilityResult;
@@ -40,7 +41,7 @@ public final class OfferAvailabilityResponse extends OfferMessage implements Sup
     private final List<Integer> supportedCapabilities;
 
     public OfferAvailabilityResponse(String offerId, AvailabilityResult availabilityResult) {
-        this(offerId, availabilityResult, null, Version.getP2PMessageVersion());
+        this(offerId, availabilityResult, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
     }
 
 
diff --git a/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java b/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java
index 8eac76f68e..6174188ae2 100644
--- a/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java
+++ b/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java
@@ -1,5 +1,6 @@
 package io.bisq.network.p2p.peers.getdata.messages;
 
+import io.bisq.common.app.Capabilities;
 import io.bisq.common.app.Version;
 import io.bisq.common.proto.network.NetworkEnvelope;
 import io.bisq.common.proto.network.NetworkProtoResolver;
@@ -45,7 +46,7 @@ public final class GetDataResponse extends NetworkEnvelope implements SupportedC
                 persistableNetworkPayloadSet,
                 requestNonce,
                 isGetUpdatedDataResponse,
-                null,
+                Capabilities.getCapabilities(),
                 Version.getP2PMessageVersion());
     }
 
diff --git a/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java b/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
index 16a771d4c9..2464c8023b 100644
--- a/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
+++ b/network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
@@ -1,6 +1,7 @@
 package io.bisq.network.p2p.peers.getdata.messages;
 
 import com.google.protobuf.ByteString;
+import io.bisq.common.app.Capabilities;
 import io.bisq.common.app.Version;
 import io.bisq.common.proto.ProtoUtil;
 import io.bisq.generated.protobuffer.PB;
@@ -26,7 +27,7 @@ public final class PreliminaryGetDataRequest extends GetDataRequest implements A
 
     public PreliminaryGetDataRequest(int nonce,
                                      Set<byte[]> excludedKeys) {
-        this(nonce, excludedKeys, null, Version.getP2PMessageVersion());
+        this(nonce, excludedKeys, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
     }
 
 
diff --git a/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java b/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java
index 7588e0640d..a051a72091 100644
--- a/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java
+++ b/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java
@@ -1,5 +1,6 @@
 package io.bisq.network.p2p.peers.peerexchange.messages;
 
+import io.bisq.common.app.Capabilities;
 import io.bisq.common.app.Version;
 import io.bisq.common.proto.network.NetworkEnvelope;
 import io.bisq.generated.protobuffer.PB;
@@ -28,7 +29,7 @@ public final class GetPeersRequest extends NetworkEnvelope implements PeerExchan
     private final List<Integer> supportedCapabilities;
 
     public GetPeersRequest(NodeAddress senderNodeAddress, int nonce, HashSet<Peer> reportedPeers) {
-        this(senderNodeAddress, nonce, reportedPeers, null, Version.getP2PMessageVersion());
+        this(senderNodeAddress, nonce, reportedPeers, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
     }
 
 
diff --git a/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java b/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java
index 968d8d6dc7..3f544e67d4 100644
--- a/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java
+++ b/network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java
@@ -1,5 +1,6 @@
 package io.bisq.network.p2p.peers.peerexchange.messages;
 
+import io.bisq.common.app.Capabilities;
 import io.bisq.common.app.Version;
 import io.bisq.common.proto.network.NetworkEnvelope;
 import io.bisq.generated.protobuffer.PB;
@@ -24,7 +25,7 @@ public final class GetPeersResponse extends NetworkEnvelope implements PeerExcha
     private final List<Integer> supportedCapabilities;
 
     public GetPeersResponse(int requestNonce, HashSet<Peer> reportedPeers) {
-        this(requestNonce, reportedPeers, null, Version.getP2PMessageVersion());
+        this(requestNonce, reportedPeers, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
     }