diff --git a/bootstrap/src/main/resources/logback.xml b/bootstrap/src/main/resources/logback.xml
index f38800df0f..cdb9ad3c35 100644
--- a/bootstrap/src/main/resources/logback.xml
+++ b/bootstrap/src/main/resources/logback.xml
@@ -19,7 +19,7 @@
 <configuration>
     <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg %xEx%n</pattern>
+            <pattern>%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg %xEx%n</pattern>
         </encoder>
     </appender>
 
diff --git a/core/src/main/java/io/bitsquare/p2p/MessageService.java b/core/src/main/java/io/bitsquare/p2p/MessageService.java
index 4cc1ee8ada..679770ec36 100644
--- a/core/src/main/java/io/bitsquare/p2p/MessageService.java
+++ b/core/src/main/java/io/bitsquare/p2p/MessageService.java
@@ -23,8 +23,6 @@ import io.bitsquare.p2p.listener.SendMessageListener;
 
 public interface MessageService extends P2PService {
 
-    void sendMessage(Peer peer, Message message, SendMessageListener listener);
-
     void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, SendMessageListener listener);
 
     void addMessageHandler(MessageHandler listener);
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
index 7986f9b62a..ba5e56ee31 100644
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java
@@ -103,6 +103,8 @@ public class BootstrappedPeerBuilder {
         this.useManualPortForwarding = useManualPortForwarding;
         this.bootstrapNode = bootstrapNode;
         this.networkInterface = networkInterface;
+
+        log.debug("Bootstrap to {}", bootstrapNode.toString());
     }
 
 
diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
index 2535e5b1ef..607515fb67 100644
--- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
+++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java
@@ -76,24 +76,11 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
     // MessageService implementation
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public void sendMessage(Peer peer, Message message, SendMessageListener listener) {
-        doSendMessage(peer, null, message, listener);
-    }
 
     @Override
     public void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, SendMessageListener listener) {
         assert pubKeyRing != null;
-        try {
-            doSendMessage(peer, pubKeyRing, cryptoService.encryptAndSignMessage(pubKeyRing, message), listener);
-        } catch (Throwable t) {
-            t.printStackTrace();
-            log.error(t.getMessage());
-            executor.execute(listener::handleFault);
-        }
-    }
 
-    private void doSendMessage(Peer peer, PubKeyRing pubKeyRing, Message message, SendMessageListener listener) {
         log.debug("sendMessage called");
         if (peer == null)
             throw new IllegalArgumentException("Peer must not be null");
@@ -101,7 +88,9 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
             throw new IllegalArgumentException("Peer must be of type TomP2PPeer");
 
         try {
-            FutureDirect futureDirect = peerDHT.peer().sendDirect(((TomP2PPeer) peer).getPeerAddress()).object(message).start();
+            final Message encryptedMessage = cryptoService.encryptAndSignMessage(pubKeyRing, message);
+
+            FutureDirect futureDirect = peerDHT.peer().sendDirect(((TomP2PPeer) peer).getPeerAddress()).object(encryptedMessage).start();
             futureDirect.addListener(new BaseFutureListener<BaseFuture>() {
                                          @Override
                                          public void operationComplete(BaseFuture future) throws Exception {
@@ -113,7 +102,7 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
                                                  log.info("sendMessage failed. We will try to send the message to the mailbox. Fault reason:  " +
                                                          futureDirect.failedReason());
                                                  if (pubKeyRing != null)
-                                                     sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) message, listener);
+                                                     sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
                                              }
                                          }
 
@@ -122,7 +111,7 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
                                              log.info("sendMessage failed with exception. We will try to send the message to the mailbox. Exception: "
                                                      + t.getMessage());
                                              if (pubKeyRing != null)
-                                                 sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) message, listener);
+                                                 sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
                                          }
                                      }
             );